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

[Natalia Bidart]

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

[Anthony Lenton (elachuni)]

+1

review: Approve

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

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

=== modified file 'src/webcatalog/api/forms.py'
--- src/webcatalog/api/forms.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/api/forms.py	2012-06-06 16:45:24 +0000
@@ -36,7 +36,7 @@
         fields = (
             'hostname',
             'logo_checksum',
-            )
+        )
 
 
 class MachineUpdatePackagesForm(forms.ModelForm):
@@ -45,4 +45,4 @@
         fields = (
             'packages_checksum',
             'package_list',
-            )
+        )

=== modified file 'src/webcatalog/api/handlers.py'
--- src/webcatalog/api/handlers.py	2012-03-23 20:14:03 +0000
+++ src/webcatalog/api/handlers.py	2012-06-06 16:45:24 +0000
@@ -28,7 +28,7 @@
     HttpResponse,
     HttpResponseBadRequest,
     HttpResponseNotFound,
-    )
+)
 from piston.handler import BaseHandler
 
 from webcatalog.models import Machine

=== modified file 'src/webcatalog/api/urls.py'
--- src/webcatalog/api/urls.py	2012-04-18 22:29:29 +0000
+++ src/webcatalog/api/urls.py	2012-06-06 16:45:24 +0000
@@ -37,13 +37,14 @@
 
 server_status_resource = never_cache(Resource(handler=ServerStatusHandler))
 list_machines_resource = never_cache(Resource(handler=ListMachinesHandler,
-    authentication=auth))
+                                              authentication=auth))
 machine_resource = never_cache(CSRFExemptResource(handler=MachineHandler,
-    authentication=auth))
+                                                  authentication=auth))
 packages_resource = never_cache(CSRFExemptResource(handler=PackagesHandler,
-    authentication=auth))
+                                                   authentication=auth))
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     # get status of the service (usually just "ok", might be "read-only")
     # to ensure we inform the user when he wants to write a review or
     # send a moderation request

=== modified file 'src/webcatalog/management/commands/check_all_latest.py'
--- src/webcatalog/management/commands/check_all_latest.py	2012-03-16 04:25:10 +0000
+++ src/webcatalog/management/commands/check_all_latest.py	2012-06-06 16:45:24 +0000
@@ -19,7 +19,7 @@
 
 from __future__ import (
     absolute_import,
-    )
+)
 
 from django.core.management.base import BaseCommand
 
@@ -28,7 +28,7 @@
 __metaclass__ = type
 __all__ = [
     'Command',
-    ]
+]
 
 BATCH_SIZE = 200
 
@@ -48,8 +48,8 @@
         Application.objects.all().update(is_latest=False)
 
         # 2. Update is_latest in batches of BATCH_SIZE.
-        packages = Application.objects.values_list('id',
-            'package_name').order_by('package_name', '-distroseries__version')
+        packages = Application.objects.values_list('id', 'package_name')
+        packages = packages.order_by('package_name', '-distroseries__version')
         current_package_name = None
         to_update = []
         for app_id, app_package_name in packages:

=== modified file 'src/webcatalog/management/commands/cleanup.py'
--- src/webcatalog/management/commands/cleanup.py	2012-04-17 16:56:44 +0000
+++ src/webcatalog/management/commands/cleanup.py	2012-06-06 16:45:24 +0000
@@ -106,13 +106,15 @@
     help = "Cleans the Django session and OAuth nonce tables."
 
     option_list = LabelCommand.option_list + (
-        make_option('--cursor-life', default=3600, dest="cursor_secs",
+        make_option(
+            '--cursor-life', default=3600, dest="cursor_secs",
             action='store',
             help="Hold a cursor open a maximum of SECS seconds"),
-        make_option('--batch-time', default=5, dest="batch_secs",
+        make_option(
+            '--batch-time', default=5, dest="batch_secs",
             action="store",
             help="Try to keep batch removal transaction time to SECS seconds"),
-        )
+    )
 
     def handle_label(self, table, **options):
         if not psycopg2_available:
@@ -124,7 +126,7 @@
         cleaner_cls = CLEANERS.get(table, None)
         if cleaner_cls is None:
             msg = ("Invalid cleaner.\nNo cleaner found for table: %s\n"
-                "Supported tables are: %s" % (table, CLEANERS.keys()))
+                   "Supported tables are: %s" % (table, CLEANERS.keys()))
             raise CommandError(msg)
         cleaner = cleaner_cls()
         connection.isolation_level = ISOLATION_LEVEL_AUTOCOMMIT

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-05-09 15:31:34 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-06-06 16:45:24 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import os
 import re
@@ -43,12 +43,11 @@
 from webcatalog.models import (
     Application,
     DistroSeries,
-    )
+)
 from webcatalog.utilities import create_png_from_file
 
 __metaclass__ = type
-__all__ = [
-    ]
+__all__ = []
 
 
 class CacheMaker(object):
@@ -97,21 +96,23 @@
 class Command(LabelCommand):
 
     help = ("Update Application data from apt cache and "
-        "app-install-data(-partner) packages.")
+            "app-install-data(-partner) packages.")
     option_list = LabelCommand.option_list + (
-        make_option('--local-app-install-data',
+        make_option(
+            '--local-app-install-data',
             action='store',
             dest='local_app_install_data',
             default='',
             help=('Use a local app-install-data deb package rather than '
                   'downloading from the archive.')),
-        make_option('--local-app-install-data-partner',
+        make_option(
+            '--local-app-install-data-partner',
             action='store',
             dest='local_app_install_data_partner',
             default='',
             help=('Use a local app-install-data-partner deb package rather '
                   'than downloading from the archive.')),
-            )
+    )
     verbosity = 1
 
     def set_cache(self, distroseries):
@@ -141,12 +142,12 @@
             self.update_from_app_data(package, distroseries, deb_location)
 
     def update_from_app_data(self, package_name, distroseries,
-        deb_location=''):
+                             deb_location=''):
         data_dir = tempfile.mkdtemp()
         # Download app install data if necessary
         if deb_location == '':
-            deb_location = self.get_package_data_for_series(package_name,
-                distroseries.code_name, data_dir)
+            deb_location = self.get_package_data_for_series(
+                package_name, distroseries.code_name, data_dir)
 
         # Extract and parse the deb archive.
         deb_file = DebFile(deb_location)
@@ -166,7 +167,7 @@
         shutil.rmtree(data_dir)
 
     def get_package_data_for_series(self, package_name, distroseries,
-        working_dir):
+                                    working_dir):
         install_data_url = self.get_package_uri_for_series(
             package_name, distroseries)
         rest, sep, deb_filename = install_data_url.rpartition('/')
@@ -180,7 +181,7 @@
 
     def get_package_uri_for_series(self, package_name, distroseries):
         self.output("Determining URI for current version of "
-                "{0} in {1}.\n".format(package_name, distroseries), 1)
+                    "{0} in {1}.\n".format(package_name, distroseries), 1)
         self.set_cache(distroseries)
         return self.cache[package_name].candidate.uri
 
@@ -267,10 +268,11 @@
         distroseries, created = DistroSeries.objects.get_or_create(
             code_name=distroseries_name)
         if created:
-            self.output("Created a DistroSeries record called '{0}'.\n".format(
-                    distroseries_name), 1)
+            msg = "Created a DistroSeries record called '{0}'.\n"
+            self.output(msg.format(distroseries_name), 1)
 
-        prefetched_apps = dict((app.package_name, app) for app in
+        prefetched_apps = dict(
+            (app.package_name, app) for app in
             Application.objects.filter(distroseries=distroseries))
 
         self.set_cache(distroseries_name)
@@ -297,7 +299,8 @@
                 for attribute, value in [
                     ('description', candidate.description),
                     ('section', candidate.section), ('version', version),
-                    ('name', app_name), ('comment', app_comment)]:
+                    ('name', app_name), ('comment', app_comment),
+                ]:
                     if getattr(app, attribute) != value:
                         setattr(app, attribute, value)
                         updated = True
@@ -312,7 +315,7 @@
                     name=app_name,
                     version=version,
                     comment=app_comment,
-                    )
+                )
 
             screenshot_url = package.candidateRecord.get('Screenshot-Url')
             if screenshot_url is not None and (

=== modified file 'src/webcatalog/management/commands/import_exhibits.py'
--- src/webcatalog/management/commands/import_exhibits.py	2012-04-13 20:49:20 +0000
+++ src/webcatalog/management/commands/import_exhibits.py	2012-06-06 16:45:24 +0000
@@ -19,7 +19,7 @@
 
 from __future__ import (
     absolute_import,
-    )
+)
 
 import json
 import urllib
@@ -31,12 +31,12 @@
 from webcatalog.models import (
     DistroSeries,
     Exhibit,
-    )
+)
 
 __metaclass__ = type
 __all__ = [
     'Command',
-    ]
+]
 
 
 class Command(BaseCommand):
@@ -71,7 +71,7 @@
                 Exhibit.objects.filter(pk=instance.pk).update(**args)
 
             distroseries = [DistroSeries.objects.get_or_create(**ds)[0]
-                for ds in exhibit.get('distroseries', [])]
+                            for ds in exhibit.get('distroseries', [])]
 
             to_remove = instance.distroseries.exclude(
                 pk__in=[x.id for x in distroseries])
@@ -81,4 +81,4 @@
         # Unpublish other exhibits
         Exhibit.objects.filter(published=True).exclude(
             sca_id__in=[xibit['id'] for xibit in exhibits]).update(
-            published=False)
+                published=False)

=== modified file 'src/webcatalog/management/commands/import_for_purchase_apps.py'
--- src/webcatalog/management/commands/import_for_purchase_apps.py	2012-05-02 14:58:15 +0000
+++ src/webcatalog/management/commands/import_for_purchase_apps.py	2012-06-06 16:45:24 +0000
@@ -22,7 +22,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import json
 import os
@@ -41,8 +41,7 @@
 )
 
 __metaclass__ = type
-__all__ = [
-    ]
+__all__ = []
 
 
 class Command(BaseCommand):

=== modified file 'src/webcatalog/management/commands/import_ratings_stats.py'
--- src/webcatalog/management/commands/import_ratings_stats.py	2012-03-20 22:23:31 +0000
+++ src/webcatalog/management/commands/import_ratings_stats.py	2012-06-06 16:45:24 +0000
@@ -20,7 +20,7 @@
 from datetime import (
     datetime,
     timedelta,
-    )
+)
 import json
 
 from django.core.management.base import LabelCommand
@@ -29,11 +29,11 @@
     Application,
     DistroSeries,
     ReviewStatsImport,
-    )
+)
 from webcatalog.utilities import (
     dampened_rating,
     WebServices,
-    )
+)
 
 
 class Command(LabelCommand):

=== modified file 'src/webcatalog/middleware/exception.py'
--- src/webcatalog/middleware/exception.py	2011-09-12 13:58:47 +0000
+++ src/webcatalog/middleware/exception.py	2012-06-06 16:45:24 +0000
@@ -55,9 +55,9 @@
             lineno = tb.tb_lineno - 1
             loader = tb.tb_frame.f_globals.get('__loader__')
             module_name = tb.tb_frame.f_globals.get('__name__')
-            pre_context_lineno, pre_context, context_line, post_context = \
-                    self._get_lines_from_file(filename, lineno, 7, loader,
-                                              module_name)
+            lines = self._get_lines_from_file(
+                filename, lineno, 7, loader, module_name)
+            pre_context_lineno, pre_context, context_line, post_context = lines
             if pre_context_lineno is not None:
                 frames.append({
                     'tb': tb,

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-06-06 16:45:24 +0000
+++ src/webcatalog/models/applications.py	2012-06-06 16:45:24 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import logging
 from datetime import datetime
@@ -43,7 +43,7 @@
     'Exhibit',
     'Machine',
     'ReviewStatsImport',
-    ]
+]
 
 
 class DistroSeries(models.Model):
@@ -82,18 +82,19 @@
     categories = models.CharField(max_length=255, blank=True)
     departments = models.ManyToManyField('Department', blank=True)
     icon_name = models.CharField(max_length=255, blank=True)
-    icon = models.ImageField(upload_to='icons/%Y/%m', max_length=200,
-        null=True, blank=True)
+    icon = models.ImageField(
+        upload_to='icons/%Y/%m', max_length=200, null=True, blank=True)
     for_purchase = models.BooleanField(default=False)
-    archive_id = models.CharField(max_length=64, null=True,
-         db_index=True, blank=True)
-    price = models.DecimalField(max_digits=7, decimal_places=2, null=True,
+    archive_id = models.CharField(
+        max_length=64, null=True, db_index=True, blank=True)
+    price = models.DecimalField(
+        max_digits=7, decimal_places=2, null=True,
         blank=True, help_text="For-purchase applications (in US Dollars).")
     application_id = models.IntegerField(null=True, blank=True)
 
     ratings_total = models.IntegerField(null=True, blank=True)
-    ratings_average = models.DecimalField(max_digits=3, decimal_places=2,
-        null=True, blank=True)
+    ratings_average = models.DecimalField(
+        max_digits=3, decimal_places=2, null=True, blank=True)
     ratings_histogram = models.CharField(max_length=128, blank=True)
     is_latest = models.BooleanField()
     wilson_score = models.FloatField(null=True, blank=True, db_index=True)
@@ -154,7 +155,7 @@
                         name=dept_name, defaults={'slug': slugify(dept_name)})
                     if created:
                         logging.warn("Department %s automatically created!" %
-                            dept_name)
+                                     dept_name)
                     self.departments.add(dept)
                     break
 
@@ -164,8 +165,9 @@
             crumbs = depts[0].crumbs(distro=self.distroseries.code_name)
         else:
             crumbs = [{'name': 'All Apps', 'url': reverse('wc-index')}]
-        crumbs.append({'name': self.name, 'url': reverse('wc-package-detail',
-            args=[self.distroseries.code_name, self.package_name])})
+        url = reverse('wc-package-detail',
+                      args=[self.distroseries.code_name, self.package_name])
+        crumbs.append({'name': self.name, 'url': url})
         return crumbs
 
     def license_type(self):
@@ -198,7 +200,7 @@
         ('icon_128', 'Icon 128x128'),
         ('screenshot', 'Screenshot'),
         ('video', 'Video'),
-        )
+    )
 
     application = models.ForeignKey(Application)
     media_type = models.CharField(max_length=16, choices=MEDIA_CHOICES)
@@ -268,7 +270,7 @@
     published = models.BooleanField()
     display = models.NullBooleanField(
         help_text="Yes: Always display. No: Never display. "
-            "Unknown: Display if published")
+                  "Unknown: Display if published")
     weight = models.IntegerField(default=0)
 
     class Meta:
@@ -281,7 +283,7 @@
             if not pkg_name:
                 return ''
             return reverse('wc-package-detail',
-                kwargs={'package_name': pkg_name})
+                           kwargs={'package_name': pkg_name})
 
-        return reverse('wc-package-list') + '?' + '&'.join(
-            ['pkg_name=%s' % pkg_name for pkg_name in pkg_names])
+        pkgs = '&'.join('pkg_name=%s' % pkg_name for pkg_name in pkg_names)
+        return reverse('wc-package-list') + '?' + pkgs

=== modified file 'src/webcatalog/models/oauthtoken.py'
--- src/webcatalog/models/oauthtoken.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/models/oauthtoken.py	2012-06-06 16:45:24 +0000
@@ -24,7 +24,7 @@
     'Consumer',
     'Nonce',
     'DataStore',
-    ]
+]
 
 import os.path
 import random
@@ -45,9 +45,7 @@
 
 
 def _set_seed():
-    if (not hasattr(_set_seed, 'seed') and
-        os.path.exists("/dev/random")):
-
+    if (not hasattr(_set_seed, 'seed') and os.path.exists("/dev/random")):
         data = open("/dev/random").read(struct.calcsize('Q'))
         random.seed(struct.unpack('Q', data))
         _set_seed.seed = True
@@ -92,7 +90,8 @@
 
     key = models.CharField(max_length=64)
 
-    secret = models.CharField(max_length=255, blank=True, null=False,
+    secret = models.CharField(
+        max_length=255, blank=True, null=False,
         default=partial(generate_random_string, CONSUMER_SECRET_LENGTH))
 
     created_at = models.DateTimeField(auto_now_add=True)

=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2012-03-12 20:14:34 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2012-06-06 16:45:24 +0000
@@ -20,12 +20,12 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 __metaclass__ = type
 __all__ = [
     'install_options',
-    ]
+]
 
 import string
 
@@ -198,4 +198,4 @@
             stars.append(0)
 
     return dict(stars=stars, total=num_ratings,
-        STATIC_URL=settings.STATIC_URL, size=size)
+                STATIC_URL=settings.STATIC_URL, size=size)