Merge lp:~nataliabidart/ubuntu-webcatalog/law-and-order.3 into lp:ubuntu-webcatalog

[Natalia Bidart]

- Fixing pep8 issues (part 3 of LP: #1007626).

[Anthony Lenton (elachuni)]

woo!

review: Approve

[ISD Branch Mangler (isd-branches-mangler)]

The prerequisite lp:~nataliabidart/ubuntu-webcatalog/law-and-order.2 has not yet been merged into lp:ubuntu-webcatalog.

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-05-03 12:13:00 +0000
+++ src/webcatalog/tests/factory.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 import os
 from datetime import (
     datetime,
@@ -42,14 +42,14 @@
     Machine,
     Nonce,
     Token,
-    )
+)
 from webcatalog.utilities import full_claimed_id
 
 __metaclass__ = type
 __all__ = [
     'TestCaseWithFactory',
     'WebCatalogObjectFactory',
-    ]
+]
 
 
 class WebCatalogObjectFactory(object):
@@ -66,7 +66,8 @@
         return prefix + str(self.get_unique_integer())
 
     def make_user(self, username=None, email=None, password='test',
-        first_name=None, last_name=None, open_id=None, is_admin=False):
+                  first_name=None, last_name=None, open_id=None,
+                  is_admin=False):
         if username is None:
             username = self.get_unique_string(prefix='username')
         if email is None:
@@ -97,11 +98,12 @@
         return user
 
     def make_application(self, package_name=None, name=None,
-        comment=None, description=None, icon_name='', icon=None,
-        distroseries=None, arch='i686', ratings_average=None,
-        ratings_total=None, ratings_histogram='', screenshot_url='',
-        archive_id=None, version='', is_latest=False, wilson_score=0.0,
-        debtags=[], application_id=None):
+                         comment=None, description=None, icon_name='',
+                         icon=None, distroseries=None, arch='i686',
+                         ratings_average=None, ratings_total=None,
+                         ratings_histogram='', screenshot_url='',
+                         archive_id=None, version='', is_latest=False,
+                         wilson_score=0.0, debtags=[], application_id=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -136,7 +138,7 @@
         return Department.objects.create(name=name, parent=parent, slug=slug)
 
     def make_exhibit(self, package_names=None, published=True, display=None,
-        distroseries=None, weight=0):
+                     distroseries=None, weight=0):
         sca_id = self.get_unique_integer()
         if package_names is None:
             package_names = self.get_unique_string(prefix='package-')
@@ -144,9 +146,9 @@
         html = self.get_unique_string(prefix='html-')
         if distroseries is None:
             distroseries = self.make_distroseries()
-        xibit = Exhibit.objects.create(sca_id=sca_id,
-            package_names=package_names, banner_url=banner_url, html=html,
-            published=published, display=display, weight=weight)
+        xibit = Exhibit.objects.create(
+            sca_id=sca_id, package_names=package_names, banner_url=banner_url,
+            html=html, published=published, display=display, weight=weight)
         xibit.distroseries.add(distroseries)
         return xibit
 
@@ -164,7 +166,7 @@
             os.path.dirname(__file__), 'test_data', file_name)
 
     def make_machine(self, owner=None, uuid=None, hostname=None,
-        package_list=None):
+                     package_list=None):
         if owner is None:
             owner = self.make_user()
         if hostname is None:
@@ -176,7 +178,8 @@
         packages_checksum = self.get_unique_string(prefix='package-checksum-')
         logo_checksum = self.get_unique_string(prefix='logo-checksum-')
 
-        return Machine.objects.create(owner=owner, hostname=hostname,
+        return Machine.objects.create(
+            owner=owner, hostname=hostname,
             uuid=uuid, packages_checksum=packages_checksum,
             package_list=package_list, logo_checksum=logo_checksum)
 
@@ -188,14 +191,14 @@
         consumer_key = user.useropenid_set.get().claimed_id.split('/')[-1]
         consumer_secret = self.get_unique_string(prefix='consumer-secret-')
         consumer = Consumer(user=user, key=consumer_key,
-            secret=consumer_secret)
+                            secret=consumer_secret)
         if save:
             consumer.save()
         token_string = self.get_unique_string(prefix='token-')
         token_secret = self.get_unique_string(prefix='token-secret-')
         token_name = self.get_unique_string(prefix='token-name-')
         token = Token(consumer=consumer, token=token_string,
-            token_secret=token_secret, name=token_name)
+                      token_secret=token_secret, name=token_name)
         if save:
             token.save()
         return token, consumer
@@ -204,7 +207,8 @@
         if token is None or consumer is None:
             assert token is None and consumer is None
             token, consumer = self.make_oauth_token_and_consumer()
-        nonce = Nonce.objects.create(token=token, consumer=consumer,
+        nonce = Nonce.objects.create(
+            token=token, consumer=consumer,
             nonce=self.get_unique_string(prefix='nonce-'))
         if created_at:
             nonce.created_at = created_at
@@ -213,8 +217,8 @@
 
     def make_session(self, expire_date=None):
         if expire_date is None:
-            expire_date = datetime.now() + timedelta(
-                seconds=self.get_unique_integer())
+            secs = self.get_unique_integer()
+            expire_date = datetime.now() + timedelta(seconds=secs)
         return Session.objects.create(
             session_key=self.get_unique_string(prefix='key-'),
             session_data=self.get_unique_string(prefix='session-data-'),

=== modified file 'src/webcatalog/tests/helpers.py'
--- src/webcatalog/tests/helpers.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/tests/helpers.py	2012-06-06 18:03:20 +0000
@@ -20,13 +20,13 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 __metaclass__ = type
 __all__ = [
     'patch_settings',
     'SettingDoesNotExist',
-    ]
+]
 
 from contextlib import contextmanager
 from django.conf import settings

=== modified file 'src/webcatalog/tests/test_api.py'
--- src/webcatalog/tests/test_api.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/tests/test_api.py	2012-06-06 18:03:20 +0000
@@ -28,7 +28,7 @@
     'ServerStatusTestCase',
     'UpdateMachineTestCase',
     'UpdatePackageListTestCase',
-    ]
+]
 
 from django.utils import simplejson
 
@@ -38,7 +38,7 @@
     OAuthConsumer,
     OAuthToken,
     OAuthSignatureMethod_PLAINTEXT,
-    )
+)
 
 from .factory import TestCaseWithFactory
 from webcatalog.models import Machine
@@ -57,8 +57,8 @@
         oatoken = OAuthToken(token.token, token.token_secret)
         oarequest = OAuthRequest.from_consumer_and_token(
             oaconsumer, oatoken, http_url=url)
-        oarequest.sign_request(OAuthSignatureMethod_PLAINTEXT(),
-            oaconsumer, oatoken)
+        oarequest.sign_request(
+            OAuthSignatureMethod_PLAINTEXT(), oaconsumer, oatoken)
         header = oarequest.to_header(realm)
         return {'HTTP_AUTHORIZATION': header['Authorization']}
 
@@ -72,16 +72,16 @@
 
     def test_read_no_machines(self):
         user = self.factory.make_user()
-        response = self.client.get(self.url,
-            **self.auth_header_for_user(self.url, user=user))
+        response = self.client.get(
+            self.url, **self.auth_header_for_user(self.url, user=user))
         self.assertEqual('[]', response.content)
 
     def test_read_multiple_machines(self):
         user = self.factory.make_user()
         machine1 = self.factory.make_machine(owner=user)
         machine2 = self.factory.make_machine(owner=user)
-        response = self.client.get(self.url,
-            **self.auth_header_for_user(self.url, user=user))
+        response = self.client.get(
+            self.url, **self.auth_header_for_user(self.url, user=user))
         data = simplejson.loads(response.content)
         self.assertEqual(2, len(data))
         expected = set([machine1.uuid, machine2.uuid])
@@ -90,7 +90,8 @@
     def test_only_returns_machines_for_the_authenticated_user(self):
         mymachine = self.factory.make_machine()
         othermachine = self.factory.make_machine()
-        response = self.client.get(self.url,
+        response = self.client.get(
+            self.url,
             **self.auth_header_for_user(self.url, user=mymachine.owner))
         data = simplejson.loads(response.content)
 
@@ -111,8 +112,8 @@
         data = simplejson.dumps({'hostname': machine.hostname + '-updated'})
         url = self.url % machine.uuid
 
-        response = self.client.post(url, data=data,
-            content_type='application/json',
+        response = self.client.post(
+            url, data=data, content_type='application/json',
             **self.auth_header_for_user(url, user=machine.owner))
 
         data = simplejson.loads(response.content)
@@ -124,8 +125,8 @@
         data = simplejson.dumps({'hostname': machine.hostname + '-updated'})
         url = self.url % machine.uuid
 
-        response = self.client.post(url, data=data,
-            content_type='application/json',
+        response = self.client.post(
+            url, data=data, content_type='application/json',
             **self.auth_header_for_user(url, user=otheruser))
 
         data = simplejson.loads(response.content)
@@ -144,20 +145,20 @@
         machine = self.factory.make_machine()
         url = self.url % machine.uuid
 
-        response = self.client.delete(url,
-            **self.auth_header_for_user(url, user=machine.owner))
+        response = self.client.delete(
+            url, **self.auth_header_for_user(url, user=machine.owner))
 
         self.assertEqual(204, response.status_code)
         self.assertRaises(Machine.DoesNotExist, Machine.objects.get,
-            uuid=machine.uuid, owner=machine.owner)
+                          uuid=machine.uuid, owner=machine.owner)
 
     def test_delete_other_users_machine_fails(self):
         machine = self.factory.make_machine()
         otheruser = self.factory.make_user()
         url = self.url % machine.uuid
 
-        response = self.client.delete(url,
-            **self.auth_header_for_user(url, user=otheruser))
+        response = self.client.delete(
+            url, **self.auth_header_for_user(url, user=otheruser))
 
         self.assertEqual(404, response.status_code)
 
@@ -174,8 +175,8 @@
         machine = self.factory.make_machine()
         url = self.url % machine.uuid
 
-        response = self.client.get(url,
-            **self.auth_header_for_user(url, user=machine.owner))
+        response = self.client.get(
+            url, **self.auth_header_for_user(url, user=machine.owner))
 
         data = simplejson.loads(response.content)
         self.assertEqual(machine.hostname, data['hostname'])
@@ -186,8 +187,8 @@
         otheruser = self.factory.make_user()
         url = self.url % machine.uuid
 
-        response = self.client.get(url,
-            **self.auth_header_for_user(url, user=otheruser))
+        response = self.client.get(
+            url, **self.auth_header_for_user(url, user=otheruser))
 
         self.assertEqual(404, response.status_code)
 
@@ -205,8 +206,8 @@
         machine = self.factory.make_machine(package_list=expected)
         url = self.url % machine.uuid
 
-        response = self.client.get(url,
-            **self.auth_header_for_user(url, user=machine.owner))
+        response = self.client.get(
+            url, **self.auth_header_for_user(url, user=machine.owner))
 
         data = simplejson.loads(response.content)
         self.assertEqual(expected, data)
@@ -216,8 +217,8 @@
         otheruser = self.factory.make_user()
         url = self.url % machine.uuid
 
-        response = self.client.get(url,
-            **self.auth_header_for_user(url, user=otheruser))
+        response = self.client.get(
+            url, **self.auth_header_for_user(url, user=otheruser))
 
         self.assertEqual(404, response.status_code)
 
@@ -235,10 +236,10 @@
         machine = self.factory.make_machine(package_list=expected)
         url = self.url % machine.uuid
         data = simplejson.dumps({'package_list': expected,
-            'packages_checksum': 'foo'})
+                                 'packages_checksum': 'foo'})
 
-        response = self.client.post(url, data=data,
-            content_type='application/json',
+        response = self.client.post(
+            url, data=data, content_type='application/json',
             **self.auth_header_for_user(url, user=machine.owner))
 
         self.assertContains(response, 'Success')
@@ -250,8 +251,8 @@
         otheruser = self.factory.make_user()
         url = self.url % machine.uuid
 
-        response = self.client.post(url, data='"foo"',
-            content_type='application/json',
+        response = self.client.post(
+            url, data='"foo"', content_type='application/json',
             **self.auth_header_for_user(url, user=otheruser))
 
         self.assertEqual(404, response.status_code)

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-05-09 08:43:11 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 import apt
 import json
 import os
@@ -29,7 +29,7 @@
 from datetime import (
     datetime,
     timedelta,
-    )
+)
 from decimal import Decimal
 
 from django.conf import settings
@@ -43,7 +43,7 @@
     patch,
     MagicMock,
     Mock,
-    )
+)
 from rnrclient import ReviewsStats
 
 from webcatalog.models import (
@@ -52,7 +52,7 @@
     Exhibit,
     Nonce,
     ReviewStatsImport,
-    )
+)
 from webcatalog.management.commands import (
     import_app_install_data,
     import_ratings_stats,
@@ -71,7 +71,7 @@
     'ImportExhibitsTestCase',
     'ImportForPurchaseAppsTestCase',
     'ImportRatingsTestCase',
-    ]
+]
 
 
 class ImportAppInstallTestCase(TestCaseWithFactory):
@@ -80,7 +80,8 @@
         u'Firefox delivers safe, easy web browsing. A familiar user '
         u'interface, enhanced security features including protection '
         u'from online identity theft, and integrated search let you '
-        u'get the most out of the web.')
+        u'get the most out of the web.'
+    )
 
     # If you want to run these tests against the real apt cache (which
     # is slower, but the real deal) you can update the following
@@ -90,7 +91,7 @@
     use_mock_apt_cache = True
 
     def make_mock_apt_package(self, name, description, uri='', summary='',
-            screenshot_url=''):
+                              screenshot_url=''):
         """Helper to DRY up creating a mock apt package."""
         mock_package = Mock(spec=apt.package.Package)
         mock_package.candidate.description = description
@@ -111,23 +112,23 @@
         And keeping the setUp readable.
         """
         mock_cache = MagicMock()
-        mock_apt_firefox = self.make_mock_apt_package('firefox',
-            description=self.FIREFOX_DESCRIPTION)
-        mock_apt_scribus = self.make_mock_apt_package('scribus',
-            description="Scribus description")
-        mock_other_app = self.make_mock_apt_package('otherapp',
-            description="Otherapp description",
+        mock_apt_firefox = self.make_mock_apt_package(
+            'firefox', description=self.FIREFOX_DESCRIPTION)
+        mock_apt_scribus = self.make_mock_apt_package(
+            'scribus', description="Scribus description")
+        mock_other_app = self.make_mock_apt_package(
+            'otherapp', description="Otherapp description",
             summary="Otherapp the Internet\nA tagline for Otherapp",
             screenshot_url="http://example.com/screenshot_for_otherapp.png")
-        mock_app_install_data = self.make_mock_apt_package('app-install-data',
-            description="App install desc.",
+        mock_app_install_data = self.make_mock_apt_package(
+            'app-install-data', description="App install desc.",
             uri='http://example.com/app-install-1.01.deb')
         cache_dict = {
             'firefox': mock_apt_firefox,
             'scribus': mock_apt_scribus,
             'otherapp': mock_other_app,
             'app-install-data': mock_app_install_data,
-            }
+        }
 
         def getitem(self, key):
             return cache_dict.get(key, None)
@@ -151,8 +152,8 @@
         # We use a temporary on-disk cache location for our
         # tests.
         self.tmp_apt_cache = tempfile.mkdtemp()
-        self.patch_cache_setting = patch.object(settings,
-            'DISK_APT_CACHE_LOCATION', self.tmp_apt_cache)
+        self.patch_cache_setting = patch.object(
+            settings, 'DISK_APT_CACHE_LOCATION', self.tmp_apt_cache)
         self.patch_cache_setting.start()
 
         if self.use_mock_apt_cache:
@@ -180,10 +181,10 @@
             call_command('import_app_install_data', 'onion', verbosity=0)
 
         self.assertEqual(2, mock_get_data_fn.call_count)
-        for call_args, package_name in zip(mock_get_data_fn.call_args_list,
-            ('app-install-data', 'app-install-data-partner')):
+        calls = ('app-install-data', 'app-install-data-partner')
+        for call_args, pkgname in zip(mock_get_data_fn.call_args_list, calls):
             args = call_args[0]
-            self.assertEqual(package_name, args[0])
+            self.assertEqual(pkgname, args[0])
             self.assertEqual('onion', args[1])
             self.assertTrue(args[2].startswith('/tmp/tmp'))
 
@@ -206,7 +207,8 @@
     def test_local_app_install_data(self):
         # We don't hit the network when provided a local app-install deb.
         with patch('urllib.urlretrieve') as mock_urlretrieve:
-            call_command('import_app_install_data', 'natty',
+            call_command(
+                'import_app_install_data', 'natty',
                 local_app_install_data=self.deb_location,
                 local_app_install_data_partner=self.deb_location,
                 verbosity=0)
@@ -232,8 +234,8 @@
     def test_applications_updated(self):
         # If applications already exist for the same series, it is
         # updated.
-        app = self.factory.make_application(package_name='scribus',
-            comment='old comment',
+        app = self.factory.make_application(
+            package_name='scribus', comment='old comment',
             distroseries=self.factory.make_distroseries(code_name='natty'))
 
         call_command(
@@ -250,8 +252,8 @@
     def test_same_app_different_distroseries(self):
         # Importing the same app (package_name) as an existing app, but
         # for a different distroseries creates a new record.
-        app = self.factory.make_application(package_name='scribus',
-            comment='old comment',
+        app = self.factory.make_application(
+            package_name='scribus', comment='old comment',
             distroseries=self.factory.make_distroseries(code_name='natty'))
 
         call_command(
@@ -330,7 +332,8 @@
         self.assertEqual("Browse the World Wide Web", firefox.comment)
 
     def test_description_updated_in_app(self):
-        app = self.factory.make_application(package_name='scribus',
+        app = self.factory.make_application(
+            package_name='scribus',
             distroseries=self.factory.make_distroseries(code_name='natty'))
 
         call_command(
@@ -355,18 +358,19 @@
 
         natty_cache = os.path.join(self.tmp_apt_cache, 'natty')
         sources_list_path = os.path.join(natty_cache, 'etc', 'apt',
-            'sources.list')
+                                         'sources.list')
         self.assertTrue(os.path.exists(os.path.join(sources_list_path)))
         with open(sources_list_path) as content:
             sources_list_content = content.read()
-        self.assertEqual("""
-deb http://archive.ubuntu.com/ubuntu natty main universe
-deb http://archive.ubuntu.com/ubuntu natty-updates main universe
-deb http://archive.ubuntu.com/ubuntu natty-backports main universe
-deb http://archive.canonical.com/ubuntu natty partner
-deb http://extras.ubuntu.com/ubuntu natty main
-""",
-            sources_list_content)
+        sources = [
+            '',  # empty line
+            'http://archive.ubuntu.com/ubuntu natty main universe',
+            'http://archive.ubuntu.com/ubuntu natty-updates main universe',
+            'http://archive.ubuntu.com/ubuntu natty-backports main universe',
+            'http://archive.canonical.com/ubuntu natty partner',
+            'http://extras.ubuntu.com/ubuntu natty main',
+        ]
+        self.assertEqual('\ndeb '.join(sources) + '\n', sources_list_content)
         if self.use_mock_apt_cache:
             self.mock_cache_class.assert_called_with(rootdir=natty_cache)
             self.assertEqual(1, self.mock_cache.update.call_count)
@@ -512,20 +516,19 @@
 
         def mock_urlopen_fn(url):
             """Return predetermined test_data content for given urls."""
-            available_apps_url = '%sapplications/any/ubuntu/any/any/' % (
-                    settings.SCA_API_URL)
+            available_apps_url = (settings.SCA_API_URL +
+                                  'applications/any/ubuntu/any/any/')
             icon_arb_url = ('http://sc.staging.ubuntu.com/'
-                        'site_media/appmedia/2012/04/ktip.png')
+                            'site_media/appmedia/2012/04/ktip.png')
             icon_hello_url = ('http://localhost:8000/'
-                          'site_media/icons/2011/06/eg_64x64.png')
+                              'site_media/icons/2011/06/eg_64x64.png')
             filenames = {
                 available_apps_url: 'sca_apps.txt',
                 icon_arb_url: 'ubuntu-cof.png',
                 icon_hello_url: 'ubuntu-cof.png',
-                }
+            }
             curdir = os.path.dirname(__file__)
-            sca_apps_file = os.path.join(curdir, 'test_data',
-                    filenames[url])
+            sca_apps_file = os.path.join(curdir, 'test_data', filenames[url])
             with open(sca_apps_file) as content:
                 self.response_content = content.read()
             mock_response = Mock()
@@ -543,7 +546,7 @@
         call_command('import_for_purchase_apps')
 
         app_for_purchase = Application.objects.get(name='MyApp',
-            distroseries=self.natty)
+                                                   distroseries=self.natty)
         self.assertEqual(True, app_for_purchase.for_purchase)
         self.assertTrue(app_for_purchase.description.find('hello') > -1)
 
@@ -551,30 +554,31 @@
         call_command('import_for_purchase_apps')
 
         app = Application.objects.get(name='MyApp',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         self.assertEqual(2, len(app.available_distroseries()))
 
     def test_app_gets_price(self):
         call_command('import_for_purchase_apps')
 
         app = Application.objects.get(name='MyApp',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         self.assertEqual(Decimal('2.50'), app.price)
 
     def test_existing_app_gets_updated_by_archive_id(self):
-        self.factory.make_application(archive_id='launchpad_zematynnad2/myppa',
+        self.factory.make_application(
+            archive_id='launchpad_zematynnad2/myppa',
             package_name='somethingelse', distroseries=self.maverick)
-        self.factory.make_application(archive_id='launchpad_zematynnad2/myppa',
-            package_name='somethingelse',
-            distroseries=self.natty)
-        self.assertEqual(2,
-            Application.objects.filter(
-                distroseries__in=(self.natty, self.maverick)).count())
+        self.factory.make_application(
+            archive_id='launchpad_zematynnad2/myppa',
+            package_name='somethingelse', distroseries=self.natty)
+        apps = Application.objects.filter(
+            distroseries__in=(self.natty, self.maverick)).count()
+        self.assertEqual(2, apps)
 
         call_command('import_for_purchase_apps')
 
         actual_apps = Application.objects.filter(
-                distroseries__in=(self.natty, self.maverick))
+            distroseries__in=(self.natty, self.maverick))
         self.assertEqual(2, actual_apps.count())
         for app in actual_apps:
             self.assertEqual('launchpad_zematynnad2/myppa', app.archive_id)
@@ -587,7 +591,7 @@
             'http://sc.staging.ubuntu.com/'
             'site_media/appmedia/2012/04/ktip.png')
         app = Application.objects.get(name='MyApp',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         # The urlopen double returns the test_data/ubuntu-cof.png which has
         # a size of 2438.
         self.assertEqual(2438, app.icon.size)
@@ -596,21 +600,21 @@
         call_command('import_for_purchase_apps')
 
         app = Application.objects.get(package_name='hello',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         self.assertEqual('1.2.3', app.version)
 
     def test_checks_latest(self):
         call_command('import_for_purchase_apps')
 
         app = Application.objects.get(package_name='hello',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         self.assertTrue(app.is_latest)
 
     def test_app_gets_screenshots(self):
         call_command('import_for_purchase_apps')
 
         app = Application.objects.get(package_name='hello',
-            distroseries=self.natty)
+                                      distroseries=self.natty)
         qs = app.applicationmedia_set.filter(media_type='screenshot')
         self.assertEqual(2, qs.count())
 
@@ -648,13 +652,13 @@
 
     def test_creates_last_import_record(self):
         onion = self.factory.make_distroseries(code_name='onion')
-        self.assertEqual(0,
-            ReviewStatsImport.objects.filter(distroseries=onion).count())
+        self.assertEqual(
+            0, ReviewStatsImport.objects.filter(distroseries=onion).count())
 
         call_command('import_ratings_stats', 'onion')
 
-        self.assertEqual(1,
-            ReviewStatsImport.objects.filter(distroseries=onion).count())
+        self.assertEqual(
+            1, ReviewStatsImport.objects.filter(distroseries=onion).count())
 
     def test_updates_last_import_record(self):
         onion = self.factory.make_distroseries(code_name='onion')
@@ -696,13 +700,13 @@
         # apps in the db.
         natty = self.factory.make_distroseries(code_name='natty')
         scribus = self.factory.make_application(package_name='scribus',
-            distroseries=natty)
+                                                distroseries=natty)
         otherapp = self.factory.make_application(package_name='otherapp',
-            distroseries=natty)
+                                                 distroseries=natty)
 
-        scribus_stats = ReviewsStats.from_dict(dict(package_name='scribus',
-            ratings_average='4.00', ratings_total=4,
-            histogram='[0, 1, 0, 1, 2]'))
+        d = dict(package_name='scribus', ratings_average='4.00',
+                 ratings_total=4, histogram='[0, 1, 0, 1, 2]')
+        scribus_stats = ReviewsStats.from_dict(d)
         self.mock_review_stats.return_value = [scribus_stats]
         call_command('import_ratings_stats', 'natty')
 
@@ -717,10 +721,12 @@
     def test_update_works_with_many_stats(self):
         """Ensure update_apps_with_stats doesn't fail with many ratings."""
         natty = self.factory.make_distroseries(code_name='natty')
-        stats = [ReviewsStats.from_dict(dict(
+        d = dict(
             package_name=self.factory.get_unique_string(prefix='package-'),
             ratings_average='5.00', ratings_total=1,
-            histogram='[0, 0, 0, 0, 1]')) for x in range(3000)]
+            histogram='[0, 0, 0, 0, 1]',
+        )
+        stats = [ReviewsStats.from_dict(d.copy()) for x in range(3000)]
         command = import_ratings_stats.Command()
 
         # update_apps_with_stats returns None on success:
@@ -730,11 +736,12 @@
         """Ensure update_apps_with_stats works with null histogram data"""
         app = self.factory.make_application()
         stats = [ReviewsStats.from_dict(dict(package_name=app.package_name,
-            ratings_average='5.00', ratings_total=1, histogram=None))]
+                                             ratings_average='5.00',
+                                             ratings_total=1, histogram=None))]
         command = import_ratings_stats.Command()
 
-        self.assertIsNone(command.update_apps_with_stats(app.distroseries,
-            stats))
+        result = command.update_apps_with_stats(app.distroseries, stats)
+        self.assertIsNone(result)
 
 
 class ImportExhibitsTestCase(TestCaseWithFactory):
@@ -744,20 +751,22 @@
         data = []
         for exhibit in exhibits:
             ds = exhibit.distroseries.get()
-            data.append({'package_names': exhibit.package_names,
+            data.append({
+                'package_names': exhibit.package_names,
                 'banner_url': exhibit.banner_url,
                 'version': ds.version,
                 'code_name': ds.code_name,
                 'html': exhibit.html,
                 'date_created': str(exhibit.date_created),
                 'weight': str(exhibit.weight),
-                'id': exhibit.sca_id})
+                'id': exhibit.sca_id,
+            })
         if changes:
             for atts, change in zip(data, changes):
                 atts.update(change)
         for xibit in data:
             xibit['distroseries'] = [{'code_name': xibit.pop('code_name'),
-                'version': xibit.pop('version')}]
+                                      'version': xibit.pop('version')}]
         return_value = json.dumps(data)
         response.read.return_value = return_value
         return response
@@ -778,10 +787,10 @@
         new_package_names = self.factory.get_unique_string(prefix='new-')
         new_banner_url = self.factory.get_unique_string(prefix='new-')
         new_html = self.factory.get_unique_string(prefix='new-')
-        mock_urlopen.return_value = self.mock_response([xibit], changes=[
-            {'package_names': new_package_names, 'banner_url': new_banner_url,
-             'html': new_html, 'weight': 3}])
-
+        mock_urlopen.return_value = self.mock_response(
+            [xibit], changes=[{'package_names': new_package_names,
+                               'banner_url': new_banner_url,
+                               'html': new_html, 'weight': 3}])
         call_command('import_exhibits')
 
         retrieved = Exhibit.objects.get()
@@ -795,8 +804,8 @@
     def test_creates_exhibit_if_scaid_does_not_match(self, mock_urlopen):
         xibit = self.factory.make_exhibit(published=False)
         new_id = xibit.sca_id + 20
-        mock_urlopen.return_value = self.mock_response([xibit], changes=[
-            {'id': new_id}])
+        mock_urlopen.return_value = self.mock_response(
+            [xibit], changes=[{'id': new_id}])
 
         call_command('import_exhibits')
 
@@ -807,7 +816,7 @@
     @patch('urllib.urlopen')
     def test_display_is_left_untouched(self, mock_urlopen):
         xibits = [self.factory.make_exhibit(display=d)
-            for d in [False, True, None]]
+                  for d in [False, True, None]]
 
         mock_urlopen.return_value = self.mock_response(xibits)
 
@@ -826,8 +835,8 @@
         banner_url = 'http://example.com/foo/bar/baz.png'
         expected = '<img src="http://example.com/foo/bar/baz.png">'
 
-        mock_urlopen.return_value = self.mock_response([xibit],
-            changes=[{'banner_url': banner_url, 'html': html}])
+        mock_urlopen.return_value = self.mock_response(
+            [xibit], changes=[{'banner_url': banner_url, 'html': html}])
 
         call_command('import_exhibits')
 
@@ -838,13 +847,13 @@
 class CheckAllLatestTestCase(TestCaseWithFactory):
     def test_updates_all(self):
         natty = self.factory.make_distroseries(code_name='natty',
-            version='11.04')
+                                               version='11.04')
         oneiric = self.factory.make_distroseries(code_name='oneiric',
-            version='11.10')
+                                                 version='11.10')
         self.factory.make_application(package_name='foo', distroseries=natty)
         self.factory.make_application(package_name='foo', distroseries=oneiric)
         self.factory.make_application(package_name='bar', distroseries=natty,
-            is_latest=True)
+                                      is_latest=True)
         self.factory.make_application(package_name='baz', distroseries=oneiric)
 
         call_command('check_all_latest')
@@ -857,13 +866,14 @@
 
 
 class CleanupTestCase(TestCaseWithFactory):
+
     @patch('webcatalog.management.commands.cleanup.connection')
     @patch('sys.stdout')
     def run_and_check_output_and_sql(self, func, output, sql, mock_stdout,
-        mock_connection):
+                                     mock_connection):
         func()
         actual_output = ''.join(str(call[0][0])
-            for call in mock_stdout.write.call_args_list)
+                                for call in mock_stdout.write.call_args_list)
         self.assertEqual(output, actual_output.split('\n'))
         call_list = mock_connection.cursor.return_value.execute.call_args_list
         for expected, call in zip(sql, call_list):
@@ -875,15 +885,16 @@
         def cleanup():
             call_command('cleanup', 'webcatalog_nonce')
         output = ['Opening cursor',
-            'Removed 0 rows (0 total removed). Batch size 1',
-            'All done.', '']
+                  'Removed 0 rows (0 total removed). Batch size 1',
+                  'All done.', '']
         sql = [
             ('CLOSE ALL',),
             ('DECLARE _oauth_nonce_clean NO SCROLL CURSOR WITH HOLD FOR '
             'SELECT id FROM webcatalog_nonce '
             "WHERE created_at < (CURRENT_TIMESTAMP - INTERVAL '5' HOUR) "
             'ORDER BY created_at',),
-            ('FETCH %s FROM _oauth_nonce_clean', [1])]
+            ('FETCH %s FROM _oauth_nonce_clean', [1]),
+        ]
         self.run_and_check_output_and_sql(cleanup, output, sql)
 
     @skipUnless(connection.vendor == 'postgresql', "Requires postgresql")
@@ -891,14 +902,15 @@
         def cleanup():
             call_command('cleanup', 'django_session')
         output = ['Opening cursor',
-            'Removed 0 rows (0 total removed). Batch size 1',
-            'All done.', '']
+                  'Removed 0 rows (0 total removed). Batch size 1',
+                  'All done.', '']
         sql = [
             ('CLOSE ALL',),
             ('DECLARE _django_session_clean NO SCROLL CURSOR WITH HOLD FOR '
              'SELECT session_key FROM django_session WHERE expire_date < '
              'CURRENT_TIMESTAMP ORDER BY expire_date',),
-            ('FETCH %s FROM _django_session_clean', [1])]
+            ('FETCH %s FROM _django_session_clean', [1]),
+        ]
         self.run_and_check_output_and_sql(cleanup, output, sql)
 
 
@@ -917,8 +929,8 @@
 Removed 0 rows (4 total removed). Batch size 4
 All done.
 '''
-        actual_output = ''.join(str(call[0][0])
-            for call in self.mock_stdout.write.call_args_list)
+        actual_output = ''.join(
+            str(call[0][0]) for call in self.mock_stdout.write.call_args_list)
         self.assertEqual(expected_output, actual_output)
 
     @skipUnless(connection.vendor == 'postgresql', "Requires postgresql")

=== modified file 'src/webcatalog/tests/test_context_processors.py'
--- src/webcatalog/tests/test_context_processors.py	2012-01-06 14:24:49 +0000
+++ src/webcatalog/tests/test_context_processors.py	2012-06-06 18:03:20 +0000
@@ -22,7 +22,7 @@
 __metaclass__ = type
 __all__ = [
     'GoogleAnalyticsTestCase',
-    ]
+]
 
 from django.core.urlresolvers import reverse
 from django.test import TestCase

=== modified file 'src/webcatalog/tests/test_department_filters.py'
--- src/webcatalog/tests/test_department_filters.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/tests/test_department_filters.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 
 from webcatalog.tests.factory import TestCaseWithFactory
@@ -28,12 +28,12 @@
     category_filter,
     package_name_filter,
     section_filter
-    )
+)
 
 __metaclass__ = type
 __all__ = [
     'DepartmentFilterTestCase',
-    ]
+]
 
 
 class DepartmentFilterTestCase(TestCaseWithFactory):

=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-05-03 13:06:53 +0000
+++ src/webcatalog/tests/test_forms.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 from django.forms import ValidationError
 from django.test import TestCase
@@ -32,7 +32,7 @@
     desktop_field_mappings,
     ForPurchaseApplicationForm,
     MultiURLField,
-    )
+)
 from webcatalog.models import Application, ApplicationMedia
 from webcatalog.tests.factory import TestCaseWithFactory
 
@@ -41,15 +41,14 @@
     'ApplicationFormTestCase',
     'ForPurchaseApplicationFormTestCase',
     'MultiURLFieldTestCase',
-    ]
+]
 
 
 class ApplicationFormTestCase(TestCaseWithFactory):
 
     def get_desktop_data(self, overrides):
         data = {
-            'Name': self.factory.get_unique_string(
-                prefix='App Name'),
+            'Name': self.factory.get_unique_string(prefix='App Name'),
             'X-AppInstall-Package': self.factory.get_unique_string(
                 prefix='pkg_name'),
             'X-AppInstall-Popcon': self.factory.get_unique_integer(),
@@ -57,7 +56,7 @@
                 prefix='section'),
             'Type': 'Application',
             'Categories': 'cat1;cat2',
-            }
+        }
         data.update(overrides)
         return data
 
@@ -85,11 +84,11 @@
         data = {
             'Name': 'My Package',
             'X-AppInstall-Package': 'mypkg',
-            }
+        }
         desktop_entry = self.get_desktop_entry(self.get_desktop_data(data))
 
-        form = ApplicationForm.get_form_from_desktop_data(desktop_entry,
-            distroseries=self.factory.make_distroseries())
+        form = ApplicationForm.get_form_from_desktop_data(
+            desktop_entry, distroseries=self.factory.make_distroseries())
 
         self.assertTrue(form.is_valid())
         self.assertEqual('My Package', form.cleaned_data['name'])
@@ -99,15 +98,15 @@
         # If the desktop data contains some blanks, then the initial
         # data from any existing instance should be used instead.
         app = self.factory.make_application(package_name='mypkg',
-            description='MyPkg description')
+                                            description='MyPkg description')
         data = {
             'Name': 'My Package',
             'X-AppInstall-Package': 'mypkg',
-            }
+        }
         desktop_entry = self.get_desktop_entry(self.get_desktop_data(data))
 
-        form = ApplicationForm.get_form_from_desktop_data(desktop_entry,
-            distroseries=app.distroseries)
+        form = ApplicationForm.get_form_from_desktop_data(
+            desktop_entry, distroseries=app.distroseries)
 
         self.assertTrue(form.is_valid())
         self.assertEqual('MyPkg description', form.cleaned_data['description'])
@@ -126,12 +125,12 @@
             'X-AppInstall-Keywords': 'jazz,rock,country',
             'Categories': 'Graphics;Jazz;Publishing',
             'MimeType': 'application/vnd.scribus;text/javascript;'
-            }
-        desktop_entry = self.get_desktop_entry(self.get_desktop_data(
-            extra_desktop_info))
+        }
+        info = self.get_desktop_data(extra_desktop_info)
+        desktop_entry = self.get_desktop_entry(info)
 
-        form = ApplicationForm.get_form_from_desktop_data(desktop_entry,
-            distroseries=self.factory.make_distroseries())
+        form = ApplicationForm.get_form_from_desktop_data(
+            desktop_entry, distroseries=self.factory.make_distroseries())
 
         self.assertTrue(form.is_valid())
         for key, value in extra_desktop_info.items():
@@ -144,12 +143,12 @@
         extra_desktop_info = {
             'X-AppInstall-Screenshot-Url': 'http://example.com/screenshot',
             'X-AppInstall-Package': app.package_name,
-            }
-        desktop_entry = self.get_desktop_entry(self.get_desktop_data(
-            extra_desktop_info))
+        }
+        info = self.get_desktop_data(extra_desktop_info)
+        desktop_entry = self.get_desktop_entry(info)
 
-        form = ApplicationForm.get_form_from_desktop_data(desktop_entry,
-            distroseries=app.distroseries)
+        form = ApplicationForm.get_form_from_desktop_data(
+            desktop_entry, distroseries=app.distroseries)
         form.save()
 
         app = Application.objects.get(pk=app.pk)
@@ -166,9 +165,10 @@
         # - It doesn't provide a real benefit as 99% of the time the field
         #   is populated by a script that doesn't have typo issues.
         distroseries = self.factory.make_distroseries()
-        form = ApplicationForm(dict(screenshot_url='http://foo.com:42/broken',
-            section='required', name='required', package_name='required',
-            distroseries=distroseries.id))
+        d = dict(screenshot_url='http://foo.com:42/broken',
+                 section='required', name='required', package_name='required',
+                 distroseries=distroseries.id)
+        form = ApplicationForm(d)
         self.assertTrue(form.is_valid())
 
 
@@ -190,29 +190,32 @@
             'screenshot_urls': [
                 'http://example.com/screenshot1.png',
                 'http://example.com/screenshot2.png',
-                ],
+            ],
             'video_embedded_html_urls': [
                 'http://example.com/video1.mp4',
-                ],
+            ],
             'archive_id': app.archive_id,
             'package_name': app.package_name,
             'name': app.name,
-            }
+        }
 
         form = ForPurchaseApplicationForm.from_api_data(data,
-            app.distroseries)
+                                                        app.distroseries)
         self.assertTrue(form.is_valid())
         form.save_media_urls()
 
         self.assertEqual(3, app.applicationmedia_set.count())
-        actual_urls = [media.url for media in app.applicationmedia_set.all()]
-        self.assertEqual([
+        actual_urls = [media.url for media in
+                       app.applicationmedia_set.all().order_by('url')]
+        expected = [
             'http://example.com/screenshot1.png',
             'http://example.com/screenshot2.png',
             'http://example.com/video1.mp4',
-            ], actual_urls)
+        ]
+        self.assertEqual(expected, actual_urls)
 
     def make_valid_data(self, **kwargs):
+        media_url = u'http://sc.staging.ubuntu.com/site_media/appmedia/'
         data = {
             u'status': u'Published',
             u'signing_key_id': u'',
@@ -222,34 +225,30 @@
             u'series': {
                 u'precise': [u'amd64', u'i386'],
                 u'oneiric': [u'i386', u'amd64']
-                },
+            },
             u'price': u'0.00',
             u'debtags': '["mouse"]',
             u'date_published': u'2012-04-30 19:34:08.011454',
             u'video_urls': [],
-            u'screenshot_url': u'http://sc.staging.ubuntu.com/'
-                                'site_media/appmedia/2012/04/'
-                                'IMG_20120401_144332.jpg',
+            u'screenshot_url': media_url + u'2012/04/IMG_20120401_144332.jpg',
             u'id': 595,
             u'categories': u'Utility',
             u'archive_id': self.factory.get_unique_string(prefix='archid/'),
             u'name': u'Test App',
             u'license': u'GNU GPL v3',
             u'support_url': u'http://example.com/foo',
-            u'icon_url': u'http://sc.staging.ubuntu.com/'
-                          'site_media/appmedia/2012/04/ktip.png',
+            u'icon_url': media_url + u'2012/04/ktip.png',
             u'comment': u'This is a test app',
             u'version': u'1.2',
             u'screenshot_urls': [
-                u'http://sc.staging.ubuntu.com/'
-                 'site_media/appmedia/2012/04/IMG_20120401_144332.jpg',
-                ],
+                media_url + u'2012/04/IMG_20120401_144332.jpg',
+            ],
             u'demo': None,
             u'department': [u'Accessories'],
             u'archive_root': u'http://extras.ubuntu.com/',
             u'tos_url': u'',
             u'channel': u'Independent',
-            }
+        }
         data.update(**kwargs)
         return data
 

=== modified file 'src/webcatalog/tests/test_handlers.py'
--- src/webcatalog/tests/test_handlers.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/tests/test_handlers.py	2012-06-06 18:03:20 +0000
@@ -25,8 +25,7 @@
     'MachineHandlerTestCase',
     'PackagesHandlerTestCase',
     'ServerStatusHandlerTestCase',
-    ]
-
+]
 
 from django.http import HttpRequest
 from django.test import TestCase
@@ -108,15 +107,15 @@
         handler = MachineHandler()
         response = handler.create(request, uuid='foo')
         self.assertContains(response, "Unable to deserialize request",
-            status_code=400)
+                            status_code=400)
 
     def test_create_missing_hostname(self):
         request = HttpRequest()
         request.data = {'logo_checksum': 'bar'}
         handler = MachineHandler()
         response = handler.create(request, 'uuid')
-        expected = {'status': 'error', 'errors':
-            {'hostname': [u'This field is required.']}}
+        expected = {'status': 'error',
+                    'errors': {'hostname': [u'This field is required.']}}
         self.assertEqual(expected, response)
 
     def test_create_blank_logo_checksum(self):
@@ -149,7 +148,7 @@
     def test_delete_invalid_uuid_returns_404(self):
         handler = MachineHandler()
         response = handler.delete(self.request,
-            self.factory.get_unique_string())
+                                  self.factory.get_unique_string())
         self.assertEqual(404, response.status_code)
 
     def test_delete(self):
@@ -161,7 +160,7 @@
         self.assertEqual(204, response.status_code)
         self.assertEqual('', response.content)
         self.assertRaises(Machine.DoesNotExist, Machine.objects.get,
-            uuid=machine.uuid)
+                          uuid=machine.uuid)
 
 
 class PackagesHandlerTestCase(HandlerTestCase):
@@ -173,7 +172,7 @@
     def test_read(self):
         expected = 'some-package-list'
         machine = self.factory.make_machine(owner=self.user,
-            package_list=expected)
+                                            package_list=expected)
         handler = PackagesHandler()
 
         response = handler.read(self.request, machine.uuid)
@@ -182,7 +181,7 @@
     def test_create_invalid_uuid_returns_404(self):
         handler = PackagesHandler()
         response = handler.create(self.request,
-            self.factory.get_unique_string())
+                                  self.factory.get_unique_string())
         self.assertEqual(404, response.status_code)
 
     def test_create_missing_data(self):
@@ -221,4 +220,4 @@
         handler = PackagesHandler()
         response = handler.create(request, uuid=machine.uuid)
         self.assertContains(response, "Unable to deserialize request",
-            status_code=400)
+                            status_code=400)

=== modified file 'src/webcatalog/tests/test_managers.py'
--- src/webcatalog/tests/test_managers.py	2012-03-16 01:42:36 +0000
+++ src/webcatalog/tests/test_managers.py	2012-06-06 18:03:20 +0000
@@ -20,8 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
-
+)
 
 from webcatalog.tests.factory import TestCaseWithFactory
 from webcatalog.models import Application
@@ -29,10 +28,11 @@
 __metaclass__ = type
 __all__ = [
     'ApplicationManagerTestCase',
-    ]
+]
 
 
 class ApplicationManagerTestCase(TestCaseWithFactory):
+
     def test_find_best_returns_none(self):
         self.assertIsNone(Application.objects.find_best(package_name='foo'))
 
@@ -41,8 +41,8 @@
         older = self.factory.make_distroseries(version='14.04')
 
         expected = self.factory.make_application(distroseries=latest)
-        self.factory.make_application(package_name=expected.package_name,
-            distroseries=older)
+        self.factory.make_application(
+            package_name=expected.package_name, distroseries=older)
 
         retrieved = Application.objects.find_best(
             package_name=expected.package_name)
@@ -52,12 +52,12 @@
     def test_check_latest(self):
         for code_name in ['lucid', 'maverick', 'natty', 'oneiric']:
             dseries = self.factory.make_distroseries(code_name=code_name)
-            self.factory.make_application(package_name='foobar',
-                distroseries=dseries)
+            self.factory.make_application(
+                package_name='foobar', distroseries=dseries)
 
         Application.objects.check_latest('foobar')
 
         retrieved = Application.objects.filter(package_name='foobar').order_by(
             '-distroseries__code_name')
-        self.assertEqual([True, False, False, False], [app.is_latest
-            for app in retrieved])
+        self.assertEqual([True, False, False, False],
+                         [app.is_latest for app in retrieved])

=== modified file 'src/webcatalog/tests/test_models.py'
--- src/webcatalog/tests/test_models.py	2012-05-07 15:49:12 +0000
+++ src/webcatalog/tests/test_models.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 from django.core.urlresolvers import reverse
 from django.core.files.images import ImageFile
@@ -33,7 +33,7 @@
     'ApplicationTestCase',
     'DepartmentTestCase',
     'ExhibitTestCase',
-    ]
+]
 
 
 class ApplicationTestCase(TestCaseWithFactory):
@@ -65,43 +65,52 @@
 
     def test_crumbs_no_department(self):
         app = self.factory.make_application()
-        self.assertEquals([], list(app.departments.all()))
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': app.name, 'url': reverse('wc-package-detail',
-            args=[app.distroseries.code_name, app.package_name])}]
-
-        self.assertEquals(expected, app.crumbs())
+        app_url = reverse('wc-package-detail',
+                          args=[app.distroseries.code_name, app.package_name])
+        self.assertEqual([], list(app.departments.all()))
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': app.name, 'url': app_url},
+        ]
+        self.assertEqual(expected, app.crumbs())
 
     def test_crumbs_department_without_parent(self):
         app = self.factory.make_application()
         app.categories = 'Game;'
         app.update_departments()
         dept = app.departments.get()
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': dept.name, 'url': reverse('wc-department',
-                kwargs={'distro': app.distroseries.code_name,
-                'dept_slug_or_id': dept.slug})},
-            {'name': app.name, 'url': reverse('wc-package-detail',
-                args=[app.distroseries.code_name, app.package_name])}]
-
-        self.assertEquals(expected, app.crumbs())
+        app_url = reverse('wc-package-detail',
+                          args=[app.distroseries.code_name, app.package_name])
+        dept_url = reverse('wc-department',
+                           kwargs={'distro': app.distroseries.code_name,
+                                   'dept_slug_or_id': dept.slug})
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': dept.name, 'url': dept_url},
+            {'name': app.name, 'url': app_url},
+        ]
+        self.assertEqual(expected, app.crumbs())
 
     def test_crumbs_department_with_parent(self):
         app = self.factory.make_application()
         app.categories = 'RolePlaying;'
         app.update_departments()
         dept = app.departments.get()
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': dept.parent.name, 'url': reverse('wc-department',
-                kwargs={'distro': app.distroseries.code_name,
-                'dept_slug_or_id': dept.parent.slug})},
-            {'name': dept.name, 'url': reverse('wc-department',
-                kwargs={'distro': app.distroseries.code_name,
-                'dept_slug_or_id': dept.slug})},
-            {'name': app.name, 'url': reverse('wc-package-detail',
-                args=[app.distroseries.code_name, app.package_name])}]
-
-        self.assertEquals(expected, app.crumbs())
+        app_url = reverse('wc-package-detail',
+                          args=[app.distroseries.code_name, app.package_name])
+        dept_url = reverse('wc-department',
+                           kwargs={'distro': app.distroseries.code_name,
+                                   'dept_slug_or_id': dept.slug})
+        parent_url = reverse('wc-department',
+                             kwargs={'distro': app.distroseries.code_name,
+                                     'dept_slug_or_id': dept.parent.slug})
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': dept.parent.name, 'url': parent_url},
+            {'name': dept.name, 'url': dept_url},
+            {'name': app.name, 'url': app_url},
+        ]
+        self.assertEqual(expected, app.crumbs())
 
     def test_icon_url_or_default_no_icon(self):
         app = self.factory.make_application()
@@ -134,12 +143,11 @@
             url='http://example.com/video.m4v')
 
         urls = app.screenshots
-
-        self.assertEqual([
+        expected = [
             'http://example.com/screenshot1.png',
             'http://example.com/screenshot2.png',
-            ],
-            urls)
+        ]
+        self.assertEqual(expected, urls)
 
     def test_screenshots_cached(self):
         # The db isn't hit if _screenshots is already
@@ -153,9 +161,8 @@
             media_type='screenshot',
             url='http://example.com/screenshot2.png')
 
-        self.assertEqual([
-            'http://example.com/screenshot1.png',
-            ], app.screenshots)
+        self.assertEqual(['http://example.com/screenshot1.png'],
+                         app.screenshots)
 
     def test_video_iframes_urls(self):
         app = self.factory.make_application()
@@ -170,12 +177,11 @@
             url='http://example.com/screenshot.png')
 
         urls = app.video_iframe_urls
-
-        self.assertEqual([
+        expected = [
             'http://example.com/video1.m4v',
             'http://example.com/video2.m4v',
-            ],
-            urls)
+        ]
+        self.assertEqual(expected, urls)
 
     def test_video_iframes_urls_cached(self):
         app = self.factory.make_application()
@@ -189,44 +195,49 @@
 
         urls = app.video_iframe_urls
 
-        self.assertEqual([
-            'http://example.com/video1.m4v',
-            ],
-            urls)
+        self.assertEqual(['http://example.com/video1.m4v'], urls)
 
 
 class DepartmentTestCase(TestCaseWithFactory):
     def test_crumbs_no_parent(self):
         dept = self.factory.make_department('Foo')
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': dept.name, 'url': reverse('wc-department',
-                kwargs={'dept_slug_or_id': dept.slug})}]
-
-        self.assertEquals(expected, dept.crumbs())
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': dept.name,
+             'url': reverse('wc-department',
+                            kwargs={'dept_slug_or_id': dept.slug})}
+        ]
+        self.assertEqual(expected, dept.crumbs())
 
     def test_crumbs_with_parent(self):
         parent = self.factory.make_department('Foo')
         dept = self.factory.make_department('Bar', parent=parent)
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': dept.parent.name, 'url': reverse('wc-department',
-                kwargs={'dept_slug_or_id': dept.parent.slug})},
-            {'name': dept.name, 'url': reverse('wc-department',
-                kwargs={'dept_slug_or_id': dept.slug})}]
-
-        self.assertEquals(expected, dept.crumbs())
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': dept.parent.name,
+             'url': reverse('wc-department',
+                            kwargs={'dept_slug_or_id': dept.parent.slug})},
+            {'name': dept.name,
+             'url': reverse('wc-department',
+                            kwargs={'dept_slug_or_id': dept.slug})}
+        ]
+        self.assertEqual(expected, dept.crumbs())
 
     def test_crumbs_with_distroseries(self):
         parent = self.factory.make_department('Foo')
         dept = self.factory.make_department('Bar', parent=parent)
-        expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
-            {'name': dept.parent.name, 'url': reverse('wc-department',
-                kwargs={'distro': 'frobbly',
-                'dept_slug_or_id': dept.parent.slug})},
-            {'name': dept.name, 'url': reverse('wc-department',
-                kwargs={'distro': 'frobbly',
-                'dept_slug_or_id': dept.slug})}]
-
-        self.assertEquals(expected, dept.crumbs(distro='frobbly'))
+        parent_url = reverse('wc-department',
+                             kwargs={'distro': 'frobbly',
+                                     'dept_slug_or_id': parent.slug})
+        dept_url = reverse('wc-department',
+                           kwargs={'distro': 'frobbly',
+                                   'dept_slug_or_id': dept.slug})
+        expected = [
+            {'name': 'All Apps', 'url': reverse('wc-index')},
+            {'name': dept.parent.name, 'url': parent_url},
+            {'name': dept.name, 'url': dept_url}
+        ]
+        self.assertEqual(expected, dept.crumbs(distro='frobbly'))
 
 
 class ExhibitTestCase(TestCaseWithFactory):
@@ -237,8 +248,7 @@
 
     def test_destination_url_multiple_packages(self):
         exhibit = self.factory.make_exhibit(package_names='foobar,baz')
-        expected = reverse('wc-package-list') + (
-                '?pkg_name=foobar&pkg_name=baz')
+        expected = reverse('wc-package-list') + '?pkg_name=foobar&pkg_name=baz'
         self.assertEqual(expected, exhibit.destination_url())
 
     def test_destination_url_blank_packages(self):

=== modified file 'src/webcatalog/tests/test_pep8.py'
--- src/webcatalog/tests/test_pep8.py	2012-03-27 15:46:44 +0000
+++ src/webcatalog/tests/test_pep8.py	2012-06-06 18:03:20 +0000
@@ -22,7 +22,7 @@
 __metaclass__ = type
 __all__ = [
     'WebCatalogPep8TestCase',
-    ]
+]
 
 import os
 import pep8
@@ -37,36 +37,34 @@
     packages = []
     exclude = ['migrations']
 
-    def message(self, text):
-        self.errors.append(text)
-
     def setUp(self):
-        self.errors = []
+        self.errors = {}
 
         class Options(object):
+            counters = defaultdict(int)
+            doctest = ''
             exclude = self.exclude
             filename = ['*.py']
-            testsuite = ''
-            doctest = ''
-            counters = defaultdict(int)
-            messages = {}
-            verbose = 0
-            quiet = 0
+            ignore = []
+            messages = self.errors
             repeat = True
+            select = []
+            show_pep8 = False
             show_source = False
-            show_pep8 = False
-            select = []
-            ignore = []
             max_line_length = 79
+            quiet = 0
+            statistics = False
+            testsuite = ''
+            verbose = 0
+
         pep8.options = Options()
-        pep8.message = self.message
         Options.physical_checks = pep8.find_checks('physical_line')
         Options.logical_checks = pep8.find_checks('logical_line')
 
     def test_all_code(self):
         for package in self.packages:
             pep8.input_dir(os.path.dirname(package.__file__))
-        self.assertEqual([], self.errors)
+        self.assertEqual(self.errors, {})
 
 
 class WebCatalogPep8TestCase(PackagePep8TestCase):

=== modified file 'src/webcatalog/tests/test_preflight.py'
--- src/webcatalog/tests/test_preflight.py	2012-05-30 22:39:39 +0000
+++ src/webcatalog/tests/test_preflight.py	2012-06-06 18:03:20 +0000
@@ -18,7 +18,7 @@
 from django.contrib.auth.models import (
     Group,
     User,
-    )
+)
 from mock import patch
 
 from webcatalog.tests.factory import TestCaseWithFactory
@@ -93,7 +93,7 @@
             'piston',
             'Django',
             'preflight',
-            ])
+        ])
         expected_checks = set([
             ('validate_config', True),
             ('database', True),
@@ -102,6 +102,6 @@
             ('recommender_available', True),
             ('rnr_available', True),
             ('screenshots_available', True),
-            ])
+        ])
         self.assertEqual(expected_libs, libs)
         self.assertEqual(expected_checks, checks)

=== modified file 'src/webcatalog/tests/test_templatetags.py'
--- src/webcatalog/tests/test_templatetags.py	2012-06-04 10:54:02 +0000
+++ src/webcatalog/tests/test_templatetags.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import unittest
 from decimal import Decimal
@@ -34,7 +34,7 @@
     install_options,
     rating_summary,
     visible_page_range,
-    )
+)
 from webcatalog.tests.factory import TestCaseWithFactory
 from webcatalog.tests.helpers import patch_settings
 
@@ -44,7 +44,7 @@
     'HtmlizePackageDescriptionTestCase',
     'RatingSummaryTestCase',
     'VisiblePageRangeTestCase',
-    ]
+]
 
 
 class InstallOptionsTestCase(TestCaseWithFactory):
@@ -52,9 +52,9 @@
     def setUp(self):
         super(InstallOptionsTestCase, self).setUp()
         self.natty = self.factory.make_distroseries(code_name='natty',
-            version='11.04')
+                                                    version='11.04')
         self.lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
+                                                    version='10.04')
 
     def make_useragent(self, linux=True, arch='x86_64', ubuntu_version=None):
         os = 'X11; Linux' if linux else 'Windows NT 5.1'
@@ -78,12 +78,11 @@
         application = self.factory.make_application(
             package_name='pkgfoo', distroseries=self.natty,
             arch='amd64')
-        context = Context(
-            dict(user_agent=self.make_useragent(
-                ubuntu_version='11.04', arch='x86_64')))
+        user_agent = self.make_useragent(ubuntu_version='11.04', arch='x86_64')
+        context = Context(dict(user_agent=user_agent))
 
         expected = dict(application=application, display_install_button=True,
-                 message_text='', display_ubuntu_download=False)
+                        message_text='', display_ubuntu_download=False)
         self.assert_context_values(context, application, expected)
 
     def test_matching_series_arch_not_supported(self):
@@ -92,14 +91,13 @@
         application = self.factory.make_application(
             name="Package Foo", package_name='pkgfoo',
             distroseries=self.natty, arch='i686')
-        context = Context(
-            dict(user_agent=self.make_useragent(
-                ubuntu_version='11.04', arch='solaris')))
+        user_agent = self.make_useragent(ubuntu_version='11.04',
+                                         arch='solaris')
+        context = Context(dict(user_agent=user_agent))
 
         expected = dict(application=application, display_install_button=False,
                         message_text='Package Foo is not available for your '
-                        'computer.',
-                        display_ubuntu_download=False)
+                        'computer.', display_ubuntu_download=False)
         self.assert_context_values(context, application, expected)
 
     def test_different_series_with_available(self):
@@ -107,21 +105,19 @@
         # available for their series, then we display a link to the app
         # for their series.
         natty_application = self.factory.make_application(
-            name="Package Foo", package_name='pkgfoo',
-            distroseries=self.natty)
+            name="Package Foo", package_name='pkgfoo', distroseries=self.natty)
         self.factory.make_application(
-            name="Package Foo", package_name='pkgfoo',
-            distroseries=self.lucid)
+            name="Package Foo", package_name='pkgfoo', distroseries=self.lucid)
         context = Context(
             dict(user_agent=self.make_useragent(ubuntu_version='10.04')))
 
         lucid_app_url = reverse('wc-package-detail', args=['lucid', 'pkgfoo'])
+        msg = ('Package Foo is also available for '
+               '<a href="{lucid_app_url}">your version of Ubuntu'
+               '</a>.'.format(lucid_app_url=lucid_app_url))
         expected = dict(application=natty_application,
                         display_install_button=False,
-            message_text='Package Foo is also available for '
-                         '<a href="{lucid_app_url}">your version of Ubuntu'
-                         '</a>.'.format(lucid_app_url=lucid_app_url),
-            display_ubuntu_download=False)
+                        message_text=msg, display_ubuntu_download=False)
         self.assert_context_values(context, natty_application, expected)
 
     def test_different_series_without_available(self):
@@ -136,8 +132,7 @@
         expected = dict(application=natty_application,
                         display_install_button=False,
                         message_text='Package Foo is not available for your '
-                        'version of Ubuntu.',
-            display_ubuntu_download=False)
+                        'version of Ubuntu.', display_ubuntu_download=False)
         self.assert_context_values(context, natty_application, expected)
 
     def test_linux_only_displays_install_button(self):
@@ -152,31 +147,27 @@
             user_agent=self.make_useragent(ubuntu_version='')))
 
         expected = dict(application=application, display_install_button=True,
-                 message_text='', display_ubuntu_download=False)
+                        message_text='', display_ubuntu_download=False)
         self.assert_context_values(context, application, expected)
 
     def test_non_linux_displays_download_ubuntu(self):
         # A non-linux client is provided a link to download ubuntu.
         application = self.factory.make_application(
             package_name='pkgfoo', name="Package Foo")
-        context = Context(dict(
-            user_agent=self.make_useragent(linux=False)))
+        user_agent = self.make_useragent(linux=False)
+        context = Context(dict(user_agent=user_agent))
 
         expected = dict(application=application, display_install_button=False,
-                 message_text='',
-                 display_ubuntu_download=True)
+                        message_text='', display_ubuntu_download=True)
         self.assert_context_values(context, application, expected)
 
     def test_template_tag_uses_config_for_ubuntu_versions(self):
         application = self.factory.make_application(
             name="Fame", distroseries=self.natty, arch='amd64')
-        context = Context(
-            dict(user_agent=self.make_useragent(
-                ubuntu_version='20.04', arch='x86_64')))
+        user_agent = self.make_useragent(ubuntu_version='20.04', arch='x86_64')
+        context = Context(dict(user_agent=user_agent))
 
-        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS={
-            '20.04': 'fancy',
-            }):
+        with patch_settings(UBUNTU_SERIES_FOR_VERSIONS={'20.04': 'fancy'}):
             install_options(context, application)
 
         self.assertFalse(context['display_install_button'])

=== modified file 'src/webcatalog/tests/test_utilities.py'
--- src/webcatalog/tests/test_utilities.py	2012-04-20 19:15:00 +0000
+++ src/webcatalog/tests/test_utilities.py	2012-06-06 18:03:20 +0000
@@ -22,7 +22,7 @@
     'IdentityProviderTestCase',
     'ScreenshotGetterTestCase',
     'WebServicesRecommenderTestCase',
-    ]
+]
 
 import json
 import os
@@ -31,7 +31,7 @@
 from webcatalog.utilities import (
     create_png_from_file,
     WebServices,
-    )
+)
 
 from django.conf import settings
 from django.core.cache import cache
@@ -49,13 +49,10 @@
             self.factory.get_test_path('access.svg'),  # SVG file
         ]
         pngpath = 'test_file_DELETEME.png'
+        self.addCleanup(lambda: os.path.exists(pngpath) and os.unlink(pngpath))
         for f in filenames:
-            try:
-                self.assertTrue(create_png_from_file(pngpath, f, 32, 32))
-                self.assertTrue(os.path.exists(pngpath))
-            finally:
-                if os.path.exists(pngpath):
-                    os.unlink(pngpath)
+            self.assertTrue(create_png_from_file(pngpath, f, 32, 32))
+            self.assertTrue(os.path.exists(pngpath))
 
     def test_invalid_files(self):
         filenames = [
@@ -64,13 +61,10 @@
             self.factory.get_test_path('junk.svg'),
         ]
         pngpath = 'test_file_DELETEME.png'
+        self.addCleanup(lambda: os.path.exists(pngpath) and os.unlink(pngpath))
         for f in filenames:
-            try:
-                self.assertFalse(create_png_from_file(pngpath, f, 32, 32))
-                self.assertFalse(os.path.exists(pngpath))
-            finally:
-                if os.path.exists(pngpath):
-                    os.unlink(pngpath)
+            self.assertFalse(create_png_from_file(pngpath, f, 32, 32))
+            self.assertFalse(os.path.exists(pngpath))
 
 
 class IdentityProviderTestCase(TestCase):
@@ -83,8 +77,9 @@
         self.assertTrue(url.startswith(self.service_root))
         if 'ws.op=validate_token' in url:
             body = ('{"consumer_secret": "foobarconsumersecret", '
-                 '"token": "foo", "consumer_key": "foobar", '
-                 '"name": "test-token", "token_secret": "foobartokensecret"}')
+                    '"token": "foo", "consumer_key": "foobar", '
+                    '"name": "test-token", '
+                    '"token_secret": "foobartokensecret"}')
         elif 'ws.op=me' in url:
             body = ('{"username": "username", "preferred_email": null, '
                     '"displayname": "Foo", "unverified_emails": ["[e-mail]"], '
@@ -113,7 +108,8 @@
         mock_request.side_effect = ServerNotFoundError
         settings.SSO_AUTH_MODE_NO_UBUNTU_SSO_PLAINTEXT_ONLY = False
 
-        self.assertRaises(ServerNotFoundError,
+        self.assertRaises(
+            ServerNotFoundError,
             WebServices().get_data_for_account, 'eg_token', 'eg_ident')
 
     @patch('httplib2.Http.request')
@@ -125,10 +121,12 @@
 
         data = web_services.get_data_for_account('eg_token', 'eg_ident')
 
-        self.assertEquals(set([u'username', u'preferred_email',
-            u'displayname', u'name', u'unverified_emails', u'verified_emails',
-            u'consumer_secret', u'token', u'openid_identifier',
-            u'consumer_key', u'token_secret']), set(data))
+        expected = [
+            u'username', u'preferred_email', u'displayname', u'name',
+            u'unverified_emails', u'verified_emails', u'consumer_secret',
+            u'token', u'openid_identifier', u'consumer_key', u'token_secret',
+        ]
+        self.assertEqual(set(expected), set(data))
 
 
 class WebServicesRecommenderTestCase(TestCaseWithFactory):
@@ -147,10 +145,10 @@
                 {u'rating': 4.0, u'package_name': u'tribaltrouble2'},
                 {u'rating': 4.0, u'package_name': u'acm'},
                 {u'rating': 4.0, u'package_name': u'zgv'},
-                {u'rating': 3.0, u'package_name': u'nautilus-wallpaper'}
-                ],
+                {u'rating': 3.0, u'package_name': u'nautilus-wallpaper'},
+            ],
             u'app': u'firefox',
-            }
+        }
         self.mock_recommend_app.return_value = self.eg_recommends
         cache.clear()
 
@@ -188,15 +186,16 @@
 class ScreenshotGetterTestCase(TestCase):
     @patch('webcatalog.utilities.urllib.urlopen')
     def test_valid_response_returns_list_of_urls(self, mock_urlopen):
-        response = json.dumps({'package': 'digikam', 'screenshots': [
+        shots = [
             {'version': '1.0', 'large_image_url': 'http://example.com/foo'},
             {'version': '1.1', 'large_image_url': 'http://example.com/bar'},
-        ]})
+        ]
+        response = json.dumps({'package': 'digikam', 'screenshots': shots})
         mock_urlopen.return_value.getcode.return_value = 200
         mock_urlopen.return_value.read.return_value = response
         expected = ['http://example.com/foo', 'http://example.com/bar']
-        self.assertEqual(expected,
-            WebServices().get_screenshots_for_package('digikam'))
+        self.assertEqual(
+            expected, WebServices().get_screenshots_for_package('digikam'))
 
     @patch('webcatalog.utilities.urllib.urlopen')
     def test_not_found_response_returns_empty_list(self, mock_urlopen):

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-06-06 13:03:45 +0000
+++ src/webcatalog/tests/test_views.py	2012-06-06 18:03:20 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import json
 import re
@@ -40,7 +40,7 @@
 from webcatalog.models import (
     Department,
     DistroSeries,
-    )
+)
 from webcatalog.tests.factory import TestCaseWithFactory
 from webcatalog.tests.helpers import patch_settings
 
@@ -57,11 +57,11 @@
     'OverviewTestCase',
     'SearchTestCase',
     'ComboViewTestCase',
-    ]
+]
 
 
 WINDOWS_USERAGENT = ('Mozilla/5.0 (Windows NT 5.1; rv:2.0) '
-                        'Gecko/20100101 Firefox/4.0')
+                     'Gecko/20100101 Firefox/4.0')
 
 UBUNTU_USERAGENT = ('Mozilla/5.0 (X11; Linux x86_64; rv:2.0.1) '
                     'Gecko/20100101 Firefox/4.0.1')
@@ -96,8 +96,8 @@
         if not detail_package:
             detail_package = app.package_name
 
-        url = reverse('wc-package-detail', args=[detail_distro,
-            detail_package])
+        url = reverse('wc-package-detail',
+                      args=[detail_distro, detail_package])
 
         if useragent:
             response = self.client.get(url, HTTP_USER_AGENT=useragent)
@@ -112,9 +112,9 @@
 
     def test_includes_application_details(self):
         # The details of an application are included in the rendered html.
-        response, app = self.get_app_and_response(name='My app foo',
-                                            comment='The best app eva.',
-                                            description='A long description.')
+        response, app = self.get_app_and_response(
+            name='My app foo', comment='The best app eva.',
+            description='A long description.')
 
         self.assertContains(response, "My app foo")
         self.assertContains(response, "The best app eva.")
@@ -142,20 +142,16 @@
     def test_link_to_package_reviews(self):
         response, app = self.get_app_and_response()
 
-        self.assertContains(response, '<a href="{0}"'.format(
-            reverse('wc-package-reviews', args=[
-                app.distroseries.code_name,
-                app.package_name,
-                ])))
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
+        self.assertContains(response, '<a href="{0}"'.format(url))
 
     def test_link_to_reviews_snippet(self):
         response, app = self.get_app_and_response()
 
-        self.assertContains(response, 'var reviews_uri = "{0}"'.format(
-            reverse('wc-package-reviews-ajax', args=[
-                app.distroseries.code_name,
-                app.package_name,
-                ])))
+        url = reverse('wc-package-reviews-ajax',
+                      args=[app.distroseries.code_name, app.package_name])
+        self.assertContains(response, 'var reviews_uri = "{0}"'.format(url))
 
     def test_link_to_recommended_apps_not_present(self):
         with patch_settings(NUM_RECOMMENDED_APPS=0):
@@ -211,8 +207,8 @@
     def test_twitter_link_does_not_contain_none(self):
         app = self.factory.make_application()
 
-        response = self.client.get(
-            reverse('wc-package-detail', args=[app.package_name]))
+        response = self.client.get(reverse('wc-package-detail',
+                                           args=[app.package_name]))
 
         self.assertContains(
             response,
@@ -234,28 +230,29 @@
         # available for their series, then we display a link to the app
         # for their series.
         lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
+                                               version='10.04')
         lucid_app = self.factory.make_application(package_name='pkgfoo',
-            distroseries=lucid)
+                                                  distroseries=lucid)
 
-        response, app = self.get_app_and_response(name="<a>Escape me",
-            useragent="blah Ubuntu/10.04 blah")
+        response, app = self.get_app_and_response(
+            name="<a>Escape me", useragent="blah Ubuntu/10.04 blah")
 
         lucid_app_url = reverse('wc-package-detail', args=['lucid', 'pkgfoo'])
-        self.assertContains(response,
+        self.assertContains(
+            response,
             '&lt;a&gt;Escape me is also available for '
             '<a href="{lucid_app_url}">your version of Ubuntu</a>.'.format(
                 lucid_app_url=lucid_app_url))
 
     def test_includes_right_navigation(self):
         lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
+                                               version='10.04')
         maverick = self.factory.make_distroseries(code_name='maverick',
-            version='10.10')
+                                                  version='10.10')
         lucid_app = self.factory.make_application(package_name='pkgfoo',
-            distroseries=lucid)
+                                                  distroseries=lucid)
         maverick_app = self.factory.make_application(package_name='pkgfoo',
-            distroseries=maverick)
+                                                     distroseries=maverick)
 
         response, app = self.get_app_and_response(name="Foobar")
 
@@ -276,7 +273,8 @@
 
     def test_response_includes_rating_summary(self):
         distro = self.factory.make_distroseries(code_name='lucid')
-        self.factory.make_application(package_name='foo', distroseries=distro,
+        self.factory.make_application(
+            package_name='foo', distroseries=distro,
             ratings_average=Decimal('3.5'), ratings_total=23)
 
         url = reverse('wc-package-detail', args=['lucid', 'foo'])
@@ -297,7 +295,7 @@
 
         self.client.post(url, data=data, follow=True)
 
-        self.assertEquals(1, len(mail.outbox))
+        self.assertEqual(1, len(mail.outbox))
         email = mail.outbox[0]
         self.assertIn(app.name, email.body)
         self.assertIn(url, email.body)
@@ -319,8 +317,8 @@
 
         response = self.client.post(url, data=data, follow=True)
 
-        self.assertNotContains(response, 'Success. Your download link '
-                            'has been sent.')
+        self.assertNotContains(response,
+                               'Success. Your download link has been sent.')
         self.assertContains(response, 'This field is required.')
 
     def test_email_error_bogus(self):
@@ -330,13 +328,13 @@
 
         response = self.client.post(url, data=data, follow=True)
 
-        self.assertNotContains(response, 'Success. Your download link '
-                            'has been sent.')
+        self.assertNotContains(response,
+                               'Success. Your download link has been sent.')
         self.assertContains(response, 'Enter a valid e-mail address.')
 
     def test_version_and_label_displayed(self):
-        app = self.factory.make_application(version='1.2.3',
-            distroseries=self.factory.make_distroseries())
+        app = self.factory.make_application(
+            version='1.2.3', distroseries=self.factory.make_distroseries())
 
         response = self.client.get(self.get_app_details_url(app))
 
@@ -344,8 +342,8 @@
         self.assertContains(response, '<td>1.2.3</td>')
 
     def test_version_label_not_displayed(self):
-        app = self.factory.make_application(version='',
-            distroseries=self.factory.make_distroseries())
+        app = self.factory.make_application(
+            version='', distroseries=self.factory.make_distroseries())
 
         response = self.client.get(self.get_app_details_url(app))
 
@@ -374,7 +372,8 @@
 
         response = self.client.get(self.get_app_details_url(app))
 
-        self.assertContains(response,
+        self.assertContains(
+            response,
             '<iframe src="http://example.com/video_iframe.html"')
 
     def test_double_entry_in_the_db_is_displayed_sainely(self):
@@ -408,12 +407,12 @@
         # If a distroseries is not included in the url, we always render the
         # latest available app
         natty = self.factory.make_distroseries(code_name='natty',
-            version='11.04')
+                                               version='11.04')
         lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
+                                               version='10.04')
         for dseries in [natty, lucid]:
             self.factory.make_application(package_name='pkgfoo',
-                distroseries=dseries)
+                                          distroseries=dseries)
 
         url = reverse('wc-package-detail', args=['pkgfoo'])
         response = self.client.get(url)
@@ -434,11 +433,10 @@
             self.factory.make_application(),
             self.factory.make_application(),
             self.factory.make_application(),
-            ]
+        ]
 
-        response = self.client.get(
-            reverse('wc-package-list') + '?' + "&".join(
-                ['pkg_name=%s' % app.package_name for app in apps]))
+        pkgs = "&".join('pkg_name=%s' % app.package_name for app in apps)
+        response = self.client.get(reverse('wc-package-list') + '?' + pkgs)
 
         self.assertEqual(200, response.status_code)
         self.assertEqual(apps, response.context['applications'])
@@ -446,8 +444,8 @@
     def test_includes_depts_in_context(self):
         depts = Department.objects.filter(parent=None).order_by('name')
 
-        response = self.client.get(
-            reverse('wc-package-list') + '?pkg_name=firefox')
+        pkgs = 'pkg_name=firefox'
+        response = self.client.get(reverse('wc-package-list') + '?' + pkgs)
 
         self.assertEqual(200, response.status_code)
         self.assertEqual(list(depts), list(response.context['depts']))
@@ -467,53 +465,50 @@
 
             response = self.client.get(url, data=data)
 
-            self.assertEquals(response.context['page'].object_list, [])
+            self.assertEqual(response.context['page'].object_list, [])
             self.assertContains(response, "You didn't search for anything")
 
     def test_search_searches_package_name(self):
         distro = self.factory.make_distroseries(code_name='lucid')
         app1 = self.factory.make_application(package_name='foo',
-            distroseries=distro)
+                                             distroseries=distro)
         app2 = self.factory.make_application(package_name='bar',
-            distroseries=distro)
+                                             distroseries=distro)
         app3 = self.factory.make_application(package_name='foobar',
-            distroseries=distro)
+                                             distroseries=distro)
         url = reverse('wc-search', args=[distro.code_name])
         expected = {'foo': set([app1, app3]), 'bar': set([app2, app3])}
         for q in expected:
-
             response = self.client.get(url, data={'q': q})
-
-            self.assertEquals(
+            self.assertEqual(
                 expected[q], set(response.context['page'].object_list))
 
     def test_search_searches_name(self):
         distro = self.factory.make_distroseries(code_name='lucid')
         app1 = self.factory.make_application(name='foo',
-            distroseries=distro)
+                                             distroseries=distro)
         app2 = self.factory.make_application(name='bar',
-            distroseries=distro)
+                                             distroseries=distro)
         app3 = self.factory.make_application(name='foobar',
-            distroseries=distro)
+                                             distroseries=distro)
         url = reverse('wc-search', args=[distro.code_name])
         expected = {'foo': set([app1, app3]), 'bar': set([app2, app3])}
         for q in expected:
-
             response = self.client.get(url, data={'q': q})
-
-            self.assertEquals(
+            self.assertEqual(
                 expected[q], set(response.context['page'].object_list))
 
     def test_search_includes_link_to_app(self):
         distro = self.factory.make_distroseries(code_name='lucid')
         app = self.factory.make_application(name='foo',
-            distroseries=distro)
+                                            distroseries=distro)
         url = reverse('wc-search', args=[distro.code_name])
 
         response = self.client.get(url, data={'q': 'foo'})
 
-        self.assertContains(response, reverse('wc-package-detail',
-            args=[app.distroseries.code_name, app.package_name]), count=2)
+        url = reverse('wc-package-detail',
+                      args=[app.distroseries.code_name, app.package_name])
+        self.assertContains(response, url, count=2)
 
     def test_search_includes_link_to_app_without_distro(self):
         app = self.factory.make_application(name='foo', is_latest=True)
@@ -521,8 +516,8 @@
 
         response = self.client.get(url, data={'q': 'foo'})
 
-        self.assertContains(response, reverse('wc-package-detail',
-            args=[app.package_name]), count=2)
+        url = reverse('wc-package-detail', args=[app.package_name])
+        self.assertContains(response, url, count=2)
 
     def test_search_no_apps_found_says_so(self):
         distro = self.factory.make_distroseries(code_name='lucid')
@@ -554,7 +549,8 @@
     def test_response_includes_rating_summary(self):
         distro = self.factory.make_distroseries(code_name='lucid')
         query = 'someimprobablequery'
-        self.factory.make_application(package_name=query, distroseries=distro,
+        self.factory.make_application(
+            package_name=query, distroseries=distro,
             ratings_average=Decimal('3.5'), ratings_total=23)
 
         url = reverse('wc-search', args=[distro.code_name])
@@ -566,10 +562,10 @@
 
     def test_response_shows_number_of_apps_found(self):
         distro = self.factory.make_distroseries(code_name='lucid')
-        self.factory.make_application(package_name='foo',
-            distroseries=distro)
-        self.factory.make_application(package_name='foobar',
-            distroseries=distro)
+        self.factory.make_application(
+            package_name='foo', distroseries=distro)
+        self.factory.make_application(
+            package_name='foobar', distroseries=distro)
         url = reverse('wc-search', args=[distro.code_name])
 
         response = self.client.get(url, data={'q': 'foo'})
@@ -578,12 +574,12 @@
 
     def test_response_shows_paginated_results(self):
         distro = self.factory.make_distroseries(code_name='lucid')
-        app1 = self.factory.make_application(name='foo',
-            distroseries=distro)
-        app2 = self.factory.make_application(name='fobar',
-            distroseries=distro)
-        app3 = self.factory.make_application(name='foobar',
-            distroseries=distro)
+        app1 = self.factory.make_application(
+            name='foo', distroseries=distro)
+        app2 = self.factory.make_application(
+            name='fobar', distroseries=distro)
+        app3 = self.factory.make_application(
+            name='foobar', distroseries=distro)
         url = reverse('wc-search', args=[distro.code_name])
 
         with patch_settings(PAGE_BATCH_SIZE=2):
@@ -637,8 +633,8 @@
 
         response = self.client.get(reverse('wc-index'))
 
-        self.assertContains(response, reverse('wc-department',
-            kwargs={'dept_slug_or_id': dept.slug}))
+        url = reverse('wc-department', kwargs={'dept_slug_or_id': dept.slug})
+        self.assertContains(response, url)
 
     def test_exhibits_widget_doesnt_display_if_no_exhibits_published(self):
         self.factory.make_exhibit(published=False)
@@ -698,7 +694,8 @@
     def test_link_to_dev_site(self):
         response = self.client.get(reverse('wc-index'))
 
-        self.assertContains(response,
+        self.assertContains(
+            response,
             '<a href="http://developer.ubuntu.com">'
             'Add your own application</a>')
 
@@ -713,22 +710,22 @@
             "https://launchpad.net/ubuntu-webcatalog",
             "http://www.ubuntu.com",
             "http://www.canonical.com",
-            ]
+        ]
         response = self.client.get(reverse('wc-index'))
         for link in links:
             self.assertContains(response, link)
 
     def make_high_medium_and_low_apps(self, score_high=5.0, score_mid=4.0,
                                       score_low=1.0):
-        high = self.factory.make_application(package_name='high',
-                    wilson_score=score_high, ratings_average=5,
-                    ratings_total=500)
-        mid = self.factory.make_application(package_name='mid',
-                    wilson_score=score_mid, ratings_average=4,
-                    ratings_total=400)
-        low = self.factory.make_application(package_name='low',
-                    wilson_score=score_low, ratings_average=1,
-                    ratings_total=100)
+        high = self.factory.make_application(
+            package_name='high', wilson_score=score_high, ratings_average=5,
+            ratings_total=500)
+        mid = self.factory.make_application(
+            package_name='mid', wilson_score=score_mid, ratings_average=4,
+            ratings_total=400)
+        low = self.factory.make_application(
+            package_name='low', wilson_score=score_low, ratings_average=1,
+            ratings_total=100)
         return (high, mid, low)
 
     def test_top_rated_apps_in_response(self):
@@ -821,47 +818,54 @@
         response = self.client.get(reverse('wc-department', kwargs={
             'distro': 'lucid', 'dept_slug_or_id': dept.id}))
 
-        self.assertContains(response, reverse('wc-department',
-            kwargs={'dept_slug_or_id': subdept.slug}))
+        url = reverse('wc-department',
+                      kwargs={'dept_slug_or_id': subdept.slug})
+        self.assertContains(response, url)
 
     def test_department_contains_links_to_subdepartments_no_distro(self):
         dept = self.factory.make_department('foo')
         subdept = self.factory.make_department('bar', parent=dept)
 
-        response = self.client.get(reverse('wc-department',
-            kwargs={'dept_slug_or_id': dept.id}))
+        url = reverse('wc-department',
+                      kwargs={'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
-        self.assertContains(response, reverse('wc-department',
-            kwargs={'dept_slug_or_id': subdept.slug}))
+        url = reverse('wc-department',
+                      kwargs={'dept_slug_or_id': subdept.slug})
+        self.assertContains(response, url)
 
     def test_department_contains_links_to_apps(self):
         app = self.factory.make_application(package_name='foo')
         dept = self.factory.make_department('bar')
         app.departments.add(dept)
 
-        response = self.client.get(reverse('wc-department', kwargs={
-            'distro': app.distroseries.code_name, 'dept_slug_or_id': dept.id}))
+        url = reverse('wc-department',
+                      kwargs={'distro': app.distroseries.code_name,
+                              'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
-        self.assertContains(response, reverse('wc-package-detail',
-            args=[app.distroseries.code_name, app.package_name]), count=2)
+        url = reverse('wc-package-detail',
+                      args=[app.distroseries.code_name, app.package_name])
+        self.assertContains(response, url, count=2)
 
     def test_department_contains_links_to_apps_with_no_distro(self):
         app = self.factory.make_application(package_name='foo', is_latest=True)
         dept = self.factory.make_department('bar')
         app.departments.add(dept)
 
-        response = self.client.get(reverse('wc-department',
-            kwargs={'dept_slug_or_id': dept.id}))
+        url = reverse('wc-department', kwargs={'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
-        self.assertContains(response, reverse('wc-package-detail',
-            args=[app.package_name]), count=2)
+        url = reverse('wc-package-detail', args=[app.package_name])
+        self.assertContains(response, url, count=2)
 
     def test_department_with_no_subdepts_doesnt_contain_header(self):
         dept = self.factory.make_department('bar')
         distro = self.factory.make_distroseries(code_name='lucid')
 
-        response = self.client.get(reverse('wc-department', kwargs={
-            'distro': 'lucid', 'dept_slug_or_id': dept.id}))
+        url = reverse('wc-department',
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
         self.assertNotContains(response, 'Subsections')
 
@@ -873,7 +877,7 @@
             app.departments.add(dept)
 
         url = reverse('wc-department',
-            kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
         with patch_settings(PAGE_BATCH_SIZE=2):
             response = self.client.get(url)
 
@@ -891,7 +895,7 @@
         dept = self.factory.make_department('bar')
         distro = self.factory.make_distroseries(code_name='lucid')
         url = reverse('wc-department',
-            kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
         response = self.client.get(url, data={'page': 'aef8'})
         page = response.context['page']
         self.assertEqual(1, page.number)
@@ -908,31 +912,31 @@
         dept = self.factory.make_department('bar')
         default = self.factory.make_distroseries(
             code_name=settings.DEFAULT_DISTRO, version='11.04')
-        lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
-        maverick = self.factory.make_distroseries(code_name='maverick',
-            version='10.10')
+        lucid = self.factory.make_distroseries(
+            code_name='lucid', version='10.04')
+        maverick = self.factory.make_distroseries(
+            code_name='maverick', version='10.10')
 
-        response = self.client.get(reverse('wc-department',
-            kwargs={
-                'distro': settings.DEFAULT_DISTRO,
-                'dept_slug_or_id': dept.id
-            }))
+        url = reverse('wc-department',
+                      kwargs={'distro': settings.DEFAULT_DISTRO,
+                              'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
         for ds in ['lucid', 'maverick']:
             url = reverse('wc-department',
-                kwargs={'distro': ds, 'dept_slug_or_id': dept.slug})
+                          kwargs={'distro': ds, 'dept_slug_or_id': dept.slug})
             self.assertContains(response, '<a href="{0}">Ubuntu'.format(url))
 
     def test_department_includes_rating_summary(self):
         dept = self.factory.make_department('bar')
         lucid = self.factory.make_distroseries(code_name='lucid')
-        app = self.factory.make_application(distroseries=lucid,
-            ratings_average=Decimal('3.5'), ratings_total=23)
+        app = self.factory.make_application(
+            distroseries=lucid, ratings_average=Decimal('3.5'),
+            ratings_total=23)
         app.departments.add(dept)
 
         url = reverse('wc-department',
-            kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.id})
         response = self.client.get(url)
 
         self.assertContains(response, 'images/star-small-1.png', 3)
@@ -941,8 +945,10 @@
     def test_invalid_distroseries_returns_404(self):
         dept = self.factory.make_department('bar')
 
-        response = self.client.get(reverse('wc-department',
-            kwargs={'distro': 'amnesiac', 'dept_slug_or_id': dept.id}))
+        url = reverse('wc-department',
+                      kwargs={'distro': 'amnesiac',
+                              'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
 
         self.assertEqual(404, response.status_code)
 
@@ -951,21 +957,21 @@
         default = self.factory.make_distroseries(
             code_name=settings.DEFAULT_DISTRO, version='11.04')
         lucid = self.factory.make_distroseries(code_name='lucid',
-            version='10.04')
+                                               version='10.04')
         maverick = self.factory.make_distroseries(code_name='maverick',
-            version='10.10')
-
-        response = self.client.get(reverse('wc-department',
-            kwargs={
-                'distro': settings.DEFAULT_DISTRO,
-                'dept_slug_or_id': dept.id
-            }))
-
-        url = reverse('wc-department',
-            kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.slug})
+                                                  version='10.10')
+
+        url = reverse('wc-department',
+                      kwargs={'distro': settings.DEFAULT_DISTRO,
+                              'dept_slug_or_id': dept.id})
+        response = self.client.get(url)
+
+        url = reverse('wc-department',
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.slug})
         lucid_pos = response.content.find('<a href="{0}">Ubuntu'.format(url))
         url = reverse('wc-department',
-            kwargs={'distro': 'maverick', 'dept_slug_or_id': dept.slug})
+                      kwargs={'distro': 'maverick',
+                              'dept_slug_or_id': dept.slug})
         maver_pos = response.content.find('<a href="{0}">Ubuntu'.format(url))
         self.assertTrue(lucid_pos > maver_pos)
 
@@ -973,16 +979,17 @@
         dept = self.factory.make_department('bar')
         self.factory.make_distroseries(code_name='lucid')
 
-        response = self.client.get(reverse('wc-department', kwargs={
-            'distro': 'lucid', 'dept_slug_or_id': dept.slug}))
+        url = reverse('wc-department',
+                      kwargs={'distro': 'lucid', 'dept_slug_or_id': dept.slug})
+        response = self.client.get(url)
 
         self.assertEqual(200, response.status_code)
 
     def test_no_distroseries_does_not_redirect(self):
         dept = self.factory.make_department('bar')
 
-        response = self.client.get(reverse('wc-department',
-            kwargs={'dept_slug_or_id': dept.slug}))
+        url = reverse('wc-department', kwargs={'dept_slug_or_id': dept.slug})
+        response = self.client.get(url)
 
         self.assertEqual(200, response.status_code)
 
@@ -1006,29 +1013,31 @@
 
     def test_only_valid_apps(self):
         response = self.client.get(reverse('wc-package-reviews',
-            args=['jaunty', 'doesntexist']))
+                                           args=['jaunty', 'doesntexist']))
 
         self.assertEqual(404, response.status_code)
 
     def test_uncached_calls_to_rnr_api(self):
         app = self.factory.make_application()
 
-        response = self.client.get(reverse('wc-package-reviews',
-            args=[app.distroseries.code_name, app.package_name]))
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
+        response = self.client.get(url)
 
         self.assertEqual(1, self.mock_get_reviews.call_count)
 
     def test_second_call_cached(self):
         app = self.factory.make_application()
 
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
         for count in range(2):
-            response = self.client.get(reverse('wc-package-reviews',
-                args=[app.distroseries.code_name, app.package_name]))
+            response = self.client.get(url)
 
         self.assertEqual(1, self.mock_get_reviews.call_count)
 
     def make_review_details(self, package_name=None, summary=None,
-        rating='3.5'):
+                            rating='3.5'):
         if package_name is None:
             package_name = self.factory.get_unique_string(prefix='pkg-')
         if summary is None:
@@ -1042,10 +1051,11 @@
         self.mock_get_reviews.return_value = [
             self.make_review_details(summary='review_summary1'),
             self.make_review_details(summary='review_summary2'),
-            ]
+        ]
 
-        response = self.client.get(reverse('wc-package-reviews',
-            args=[app.distroseries.code_name, app.package_name]))
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
+        response = self.client.get(url)
 
         self.assertTemplateUsed(
             response, 'webcatalog/application_review_list.html')
@@ -1059,10 +1069,11 @@
         self.mock_get_reviews.return_value = [
             self.make_review_details(summary='review_summary1'),
             self.make_review_details(summary='review_summary2'),
-            ]
+        ]
 
-        response = self.client.get(reverse('wc-package-reviews-ajax',
-            args=[app.distroseries.code_name, app.package_name]))
+        url = reverse('wc-package-reviews-ajax',
+                      args=[app.distroseries.code_name, app.package_name])
+        response = self.client.get(url)
 
         self.assertTemplateNotUsed(
             response, 'webcatalog/application_review_list.html')
@@ -1076,8 +1087,9 @@
         del self.get_reviews_patcher
         app = self.factory.make_application(package_name='invalid:name')
 
-        response = self.client.get(reverse('wc-package-reviews',
-            args=[app.distroseries.code_name, app.package_name]))
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
+        response = self.client.get(url)
 
         self.assertEqual(200, response.status_code)
 
@@ -1087,7 +1099,7 @@
         self.factory.make_application(package_name='skype', distroseries=ds)
 
         response = self.client.get(reverse('wc-package-reviews',
-            args=[ds.code_name, 'skype']))
+                                           args=[ds.code_name, 'skype']))
 
         self.assertEqual(200, response.status_code)
 
@@ -1095,8 +1107,9 @@
         app = self.factory.make_application()
         self.mock_get_reviews.side_effect = APIError('500', 'error')
 
-        response = self.client.get(reverse('wc-package-reviews',
-            args=[app.distroseries.code_name, app.package_name]))
+        url = reverse('wc-package-reviews',
+                      args=[app.distroseries.code_name, app.package_name])
+        response = self.client.get(url)
 
         self.assertEqual(200, response.status_code)
 
@@ -1109,14 +1122,14 @@
 
     def test_only_valid_apps(self):
         response = self.client.get(reverse('wc-package-screenshots',
-            args=['doesntexist']))
+                                           args=['doesntexist']))
 
         self.assertEqual(404, response.status_code)
 
     @patch('webcatalog.utilities.urllib.urlopen')
     def test_uncached_calls_to_rnr_api(self, mock_urlopen):
         self.client.get(reverse('wc-package-screenshots',
-            args=[self.app.package_name]))
+                                args=[self.app.package_name]))
 
         self.assertEqual(1, mock_urlopen.call_count)
 
@@ -1124,7 +1137,7 @@
     def test_second_call_cached(self, mock_urlopen):
         for count in range(2):
             self.client.get(reverse('wc-package-screenshots',
-                args=[self.app.package_name]))
+                                    args=[self.app.package_name]))
 
         self.assertEqual(1, mock_urlopen.call_count)
 
@@ -1133,7 +1146,7 @@
         mock_get_screenshots.return_value = self.expected
 
         response = self.client.get(reverse('wc-package-screenshots',
-            args=[self.app.package_name]))
+                                           args=[self.app.package_name]))
 
         self.assertTemplateNotUsed(
             response, 'webcatalog/application_review_list.html')
@@ -1145,9 +1158,10 @@
         mock_get_screenshots.return_value = self.expected
 
         with patch_settings(CACHE_MIDDLEWARE_SECONDS=600):
-            response = self.client.get(reverse('wc-package-screenshots',
-                args=[self.app.package_name]),
-                HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+            url = reverse('wc-package-screenshots',
+                          args=[self.app.package_name])
+            response = self.client.get(url,
+                                       HTTP_X_REQUESTED_WITH='XMLHttpRequest')
 
         self.assertEqual('max-age=600', response['cache-control'])
 
@@ -1156,7 +1170,7 @@
         self.factory.make_application(package_name=self.app.package_name)
 
         response = self.client.get(reverse('wc-package-screenshots',
-            args=[self.app.package_name]))
+                                           args=[self.app.package_name]))
 
         self.assertEqual(200, response.status_code)
 
@@ -1164,13 +1178,13 @@
     def test_not_dependent_on_is_latest(self, mock_urlopen):
         lucid = self.factory.make_distroseries(code_name='lucid')
         maverick = self.factory.make_distroseries(code_name='maverick')
-        self.factory.make_application(package_name='foo', distroseries=lucid,
-            is_latest=False)
-        self.factory.make_application(package_name='foo',
-            distroseries=maverick, is_latest=False)
+        self.factory.make_application(
+            package_name='foo', distroseries=lucid, is_latest=False)
+        self.factory.make_application(
+            package_name='foo', distroseries=maverick, is_latest=False)
 
         response = self.client.get(reverse('wc-package-screenshots',
-            args=['foo']))
+                                           args=['foo']))
 
         self.assertEqual(200, response.status_code)
 
@@ -1191,16 +1205,16 @@
                 {u'rating': 4.0, u'package_name': u'tribaltrouble2'},
                 {u'rating': 4.0, u'package_name': u'acm'},
                 {u'rating': 4.0, u'package_name': u'zgv'},
-                {u'rating': 3.0, u'package_name': u'nautilus-wallpaper'}
-                ],
+                {u'rating': 3.0, u'package_name': u'nautilus-wallpaper'},
+            ],
             u'app': u'firefox',
-            }
+        }
         self.mock_get_recommends.return_value = self.eg_recommends
         cache.clear()
 
     def test_only_valid_apps(self):
         response = self.client.get(reverse('wc-package-recommends',
-            args=['doesntexist']))
+                                           args=['doesntexist']))
 
         self.assertEqual(404, response.status_code)
 

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-06-06 18:03:19 +0000
+++ src/webcatalog/views.py	2012-06-06 18:03:20 +0000
@@ -159,7 +159,7 @@
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)
 
-    context = {
+    cntxt = {
         'dept': dept,
         'subdepts': subdepts,
         'page': paginator.page(page_num),
@@ -168,7 +168,7 @@
         'distroseries': distro,
     }
     return render_to_response('webcatalog/department_overview.html',
-                              context_instance=RequestContext(request, context))
+                              context_instance=RequestContext(request, cntxt))
 
 
 def application_list(request):