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

[Natalia Bidart]

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

[Anthony Lenton (elachuni)]

Looks good, thanks!

review: Approve

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

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

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2012-04-18 21:27:46 +0000
+++ src/webcatalog/admin.py	2012-06-06 17:47:19 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 from django.contrib import admin
 from webcatalog.models import (
     Application,
@@ -29,18 +29,18 @@
     DistroSeries,
     Exhibit,
     Machine,
-    )
+)
 
 __metaclass__ = type
 __all__ = [
     'ApplicationAdmin',
     'MachineAdmin',
-    ]
+]
 
 
 class ApplicationAdmin(admin.ModelAdmin):
     list_display = ('package_name', 'name', 'comment', 'distroseries',
-        'wilson_score')
+                    'wilson_score')
     search_fields = ('package_name', 'name', 'comment')
     list_filter = ('distroseries', 'for_purchase', 'is_latest', 'departments')
     exclude = ('for_purchase', 'archive_id')
 
=== modified file 'src/webcatalog/auth.py'
--- src/webcatalog/auth.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/auth.py	2012-06-06 17:47:19 +0000
@@ -23,7 +23,7 @@
 __metaclass__ = type
 __all__ = [
     'SSOOAuthAuthentication',
-    ]
+]
 
 from datetime import datetime, timedelta
 from django.conf import settings
@@ -39,8 +39,8 @@
     full_claimed_id,
 )
 
-TOKEN_CACHE_EXPIRY = timedelta(hours=getattr(settings,
-    'TOKEN_CACHE_EXPIRY_HOURS', 4))
+TOKEN_CACHE_EXPIRY_HOURS = getattr(settings, 'TOKEN_CACHE_EXPIRY_HOURS', 4)
+TOKEN_CACHE_EXPIRY = timedelta(hours=TOKEN_CACHE_EXPIRY_HOURS)
 
 
 class SSOOAuthAuthentication(OAuthAuthentication):
@@ -71,8 +71,8 @@
             request.method, request.build_absolute_uri(), headers=headers,
             query_string=request.META['QUERY_STRING'])
         if (orequest is None or
-            not 'oauth_token' in orequest.parameters or
-            not 'oauth_consumer_key' in orequest.parameters):
+                not 'oauth_token' in orequest.parameters or
+                not 'oauth_consumer_key' in orequest.parameters):
             return False
 
         self.prefetch_oauth_consumer(orequest)
@@ -95,11 +95,11 @@
         oauthtoken = request.get_parameter('oauth_token')
         consumer_key = request.get_parameter('oauth_consumer_key')
         tokens = Token.objects.filter(token=oauthtoken,
-            consumer__key=consumer_key)
-        if len(tokens) == 0 or (tokens[0].updated_at <
-            datetime.now() - TOKEN_CACHE_EXPIRY):
-            pieces = web_services.get_data_for_account(token=oauthtoken,
-                openid_identifier=consumer_key,
+                                      consumer__key=consumer_key)
+        if (len(tokens) == 0 or
+                tokens[0].updated_at < datetime.now() - TOKEN_CACHE_EXPIRY):
+            pieces = web_services.get_data_for_account(
+                token=oauthtoken, openid_identifier=consumer_key,
                 signature=request.get_parameter('oauth_signature'))
             if not pieces:
                 return
@@ -111,10 +111,11 @@
                     useropenid__claimed_id=claimed_id)
             except User.DoesNotExist:
                 if (not pieces.get('preferred_email') or
-                    not pieces.get('username')):
+                        not pieces.get('username')):
                     return
                 user = User.objects.create_user(pieces['username'],
-                    pieces['preferred_email'], password=None)
+                                                pieces['preferred_email'],
+                                                password=None)
                 user.useropenid_set.create(claimed_id=claimed_id)
 
             displayname = pieces['displayname']
@@ -123,11 +124,11 @@
                     ' ')
                 user.save()
 
-            consumer, created = Consumer.objects.get_or_create(user=user,
-                key=consumer_key, secret=pieces['consumer_secret'])
-            token, created = Token.objects.get_or_create(consumer=consumer,
-                token=pieces['token'], token_secret=pieces['token_secret'],
-                name=pieces['name'])
+            consumer, created = Consumer.objects.get_or_create(
+                user=user, key=consumer_key, secret=pieces['consumer_secret'])
+            token, created = Token.objects.get_or_create(
+                consumer=consumer, token=pieces['token'],
+                token_secret=pieces['token_secret'], name=pieces['name'])
             if not created:
                 # Update updated_at
                 token.save()
 
=== modified file 'src/webcatalog/context_processors.py'
--- src/webcatalog/context_processors.py	2012-04-19 14:27:02 +0000
+++ src/webcatalog/context_processors.py	2012-06-06 17:47:19 +0000
@@ -31,4 +31,5 @@
         num_recommended_apps=settings.NUM_RECOMMENDED_APPS,
         google_analytics_id=getattr(settings, 'GOOGLE_ANALYTICS_ID', None),
         secondary_google_analytics_id=getattr(settings,
-            'SECONDARY_GOOGLE_ANALYTICS_ID', None))
+                                              'SECONDARY_GOOGLE_ANALYTICS_ID',
+                                              None))
 
=== modified file 'src/webcatalog/department_filters.py'
--- src/webcatalog/department_filters.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/department_filters.py	2012-06-06 17:47:19 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import re
 
@@ -29,7 +29,7 @@
 __metaclass__ = type
 __all__ = [
     'department_filters',
-    ]
+]
 
 
 def category_filter(categories_set):
@@ -79,24 +79,26 @@
     'Web Browsers': [category_filter(set(['WebBrowser']))],
     'Office': [category_filter(set(['Office']))],
     'Science & Engineering': [category_filter(set(['Science'])),
-        section_filter(['science'])],
+                              section_filter(['science'])],
     'Astronomy': [category_filter(set(['Astronomy']))],
     'Biology': [category_filter(set(['Biology']))],
     'Chemistry': [category_filter(set(['Chemistry']))],
     'Computing & Robotics': [category_filter(set(['ArtificialIntelligence',
-        'ComputerScience', 'Robotics']))],
+                                                  'ComputerScience',
+                                                  'Robotics']))],
     'Electronics': [category_filter(set(['Electronics']))],
     'Engineering': [category_filter(set(['Engineering']))],
     'Geography': [category_filter(set(['Geography']))],
     'Geology': [category_filter(set(['Geology', 'Geoscience']))],
     'Mathematics': [category_filter(set(['DataVisualization', 'Math',
-        'NumericalAnalysis'])), section_filter(['math', 'gnu-r'])],
+                                         'NumericalAnalysis'])),
+                    section_filter(['math', 'gnu-r'])],
     'Physics': [category_filter(set(['Electricity', 'Physics']))],
     'Sound & Video': [category_filter(set(['AudioVideo', 'Audio', 'Video']))],
     'Themes & Tweaks': [category_filter(set(['Settings']))],
     'Universal Access': [category_filter(set(['Accessibility']))],
     'Developer Tools': [category_filter(set(['Development'])),
-        section_filter(['devel'])],
+                        section_filter(['devel'])],
     'Debugging': [category_filter(set(['Debugger']))],
     'Graphic Interface Design': [category_filter(set(['GUIDesigner']))],
     'Haskell': [section_filter(['haskell'])],
@@ -112,6 +114,6 @@
     'Python': [section_filter(['python'])],
     'Ruby': [section_filter(['ruby'])],
     'Version Control': [category_filter(set(['RevisionControl'])),
-        section_filter(['vcs'])],
+                        section_filter(['vcs'])],
     'Web Development': [category_filter(set(['WebDevelopment']))],
 }
 
=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-05-25 07:42:30 +0000
+++ src/webcatalog/forms.py	2012-06-06 17:47:19 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import apt
 import json
@@ -40,7 +40,7 @@
 __all__ = [
     'ApplicationForm',
     'desktop_field_mappings',
-    ]
+]
 
 desktop_field_mappings = {
     'x-appinstall-package': 'package_name',
@@ -53,7 +53,7 @@
     'x-appinstall-section': 'section',
     'type': 'app_type',
     'icon': 'icon_name',
-    }
+}
 
 
 class ApplicationForm(forms.ModelForm):
@@ -143,7 +143,7 @@
             app_data['description'] = description
         if 'debtags' in app_data and app_data['debtags']:
             app_data['debtags'] = json.dumps([get_hw_short_description(x)
-                                   for x in app_data['debtags']])
+                                              for x in app_data['debtags']])
         app_data['application_id'] = app_data.get('id')
 
         try:
@@ -195,7 +195,7 @@
         text = render_to_string('webcatalog/email_download_link.txt',
                                 context)
         sender = ("Ubuntu Application Directory <%s>" %
-                settings.NOREPLY_FROM_ADDRESS)
+                  settings.NOREPLY_FROM_ADDRESS)
         recipient = [self.cleaned_data['email']]
         message = EmailMultiAlternatives(subject, text, sender, recipient)
         message.attach_alternative(html, 'text/html')
 
=== modified file 'src/webcatalog/hw.py'
--- src/webcatalog/hw.py	2012-03-26 17:28:23 +0000
+++ src/webcatalog/hw.py	2012-06-06 17:47:19 +0000
@@ -48,32 +48,32 @@
     'hardware::digicam': _('This software requires a digital camera, but none '
                            'are currently connected'),
     'hardware::webcam': _('This software requires a video camera, but none '
-                           'are currently connected'),
+                          'are currently connected'),
     'hardware::input:mouse': _('This software requires a mouse, '
-                                'but none is currently setup.'),
+                               'but none is currently setup.'),
     'hardware::input:joystick': _('This software requires a joystick, '
-                                   'but none are currently connected.'),
+                                  'but none are currently connected.'),
     'hardware::input:touchscreen': _('This software requires a touchscreen, '
-                                      'but the computer does not have one.'),
+                                     'but the computer does not have one.'),
     'hardware::gps': _('This software requires a GPS, '
-                        'but the computer does not have one.'),
+                       'but the computer does not have one.'),
     'hardware::laptop': _('This software is for notebook computers.'),
     'hardware::printer': _('This software requires a printer, but none '
                            'are currently set up.'),
     'hardware::scanner': _('This software requires a scanner, but none are '
-                            'currently set up.'),
+                           'currently set up.'),
     'hardware::stoarge:cd': _('This software requires a CD drive, but none '
-                               'are currently connected.'),
+                              'are currently connected.'),
     'hardware::storage:cd-writer': _('This software requires a CD burner, '
-                                      'but none are currently connected.'),
+                                     'but none are currently connected.'),
     'hardware::storage:dvd': _('This software requires a DVD drive, but none '
-                                'are currently connected.'),
+                               'are currently connected.'),
     'hardware::storage:dvd-writer': _('This software requires a DVD burner, '
-                                       'but none are currently connected.'),
+                                      'but none are currently connected.'),
     'hardware::storage:floppy': _('This software requires a floppy disk '
-                                   'drive, but none are currently connected.'),
+                                  'drive, but none are currently connected.'),
     'hardware::video:opengl': _('This computer does not have graphics fast '
-                                 'enough for this software.'),
+                                'enough for this software.'),
     # private extension
     OPENGL_DRIVER_BLACKLIST_TAG: _(u'This software does not work with the '
                                    u'\u201c%s\u201D graphics driver this '
 
=== modified file 'src/webcatalog/managers.py'
--- src/webcatalog/managers.py	2012-03-16 01:42:36 +0000
+++ src/webcatalog/managers.py	2012-06-06 17:47:19 +0000
@@ -20,13 +20,13 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 
 __metaclass__ = type
 __all__ = [
     'ApplicationManager',
-    ]
+]
 
 from django.db import models
 from django.http import Http404
 
=== modified file 'src/webcatalog/preflight.py'
--- src/webcatalog/preflight.py	2012-05-31 20:29:23 +0000
+++ src/webcatalog/preflight.py	2012-06-06 17:47:19 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 from django import db
 from django.conf import settings
@@ -34,7 +34,7 @@
 __metaclass__ = type
 __all__ = [
     'WebcatalogPreflight'
-    ]
+]
 
 
 class WebcatalogPreflight(Preflight):
 
=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2012-06-04 10:54:02 +0000
+++ src/webcatalog/schema.py	2012-06-06 17:47:19 +0000
@@ -34,7 +34,7 @@
 
     class oops(schema.Section):
         oops_dir = schema.StringOption(help='Absolute path to the directory'
-            ' oops reports will be stored in')
+                                            ' oops reports will be stored in')
 
     class openid(schema.Section):
         openid_sso_server_url = schema.StringOption()
@@ -56,13 +56,13 @@
         oauth_data_store = schema.StringOption(
             default='webcatalog.models.oauthtoken.DataStore')
         convoy_root = schema.StringOption()
-        featured_apps = schema.ListOption(item=schema.StringOption(),
-            default=[])
+        featured_apps = schema.ListOption(
+            item=schema.StringOption(), default=[])
         number_top_rated_apps = schema.IntOption(default=8)
         screenshots_base_url = schema.StringOption(
             default='http://screenshots.ubuntu.com/')
-        hib_apps = schema.ListOption(item=schema.StringOption(),
-            default=[])
+        hib_apps = schema.ListOption(
+            item=schema.StringOption(), default=[])
         ubuntu_series_for_versions = schema.DictOption(
             item=schema.StringOption())
 
 
=== modified file 'src/webcatalog/urls.py'
--- src/webcatalog/urls.py	2012-05-07 13:43:04 +0000
+++ src/webcatalog/urls.py	2012-06-06 17:47:19 +0000
@@ -20,17 +20,18 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 from django.conf.urls.defaults import patterns, include, url
 from django.views.generic import TemplateView
 
 __metaclass__ = type
 __all__ = [
     'urlpatterns',
-    ]
-
-
-urlpatterns = patterns('webcatalog.views',
+]
+
+
+urlpatterns = patterns(
+    'webcatalog.views',
     url(r'^$', 'index', name='wc-index'),
     url(r'^department/(?P<distro>[-.+\w]+)/(?P<dept_slug_or_id>[\w\d-]+)/$',
         'department_overview', name='wc-department'),
@@ -45,8 +46,7 @@
     url(r'^applications/(?P<package_name>[-.+:\w]+)/$', 'application_detail',
         name="wc-package-detail"),
     url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+:\w]+)/'
-        r'reviews/$',
-        'application_reviews', name="wc-package-reviews"),
+        r'reviews/$', 'application_reviews', name="wc-package-reviews"),
     url(r'^applications/(?P<distro>[-.+\w]+)/(?P<package_name>[-.+:\w]+)/'
         r'reviews-ajax/$', 'application_reviews', kwargs={'ajax': True},
         name="wc-package-reviews-ajax"),
 
=== modified file 'src/webcatalog/utilities.py'
--- src/webcatalog/utilities.py	2012-06-04 10:55:44 +0000
+++ src/webcatalog/utilities.py	2012-06-06 17:47:19 +0000
@@ -26,7 +26,7 @@
     'UserAgentString',
     'WebServices',
     'WebServiceError',
-    ]
+]
 
 import json
 import logging
@@ -41,7 +41,7 @@
 from piston_mini_client.auth import (
     BasicAuthorizer,
     OAuthAuthorizer,
-    )
+)
 from piston_mini_client.failhandlers import APIError
 from piston_mini_client.validators import ValidationException
 from rnrclient import RatingsAndReviewsAPI
@@ -61,9 +61,10 @@
 
     @property
     def identity_provider(self):
-        return SingleSignOnAPI(service_root=settings.SSO_API_SERVICE_ROOT,
-            auth=BasicAuthorizer(settings.SSO_API_AUTH_USERNAME,
-                settings.SSO_API_AUTH_PASSWORD))
+        auth = BasicAuthorizer(settings.SSO_API_AUTH_USERNAME,
+                               settings.SSO_API_AUTH_PASSWORD)
+        return SingleSignOnAPI(
+            service_root=settings.SSO_API_SERVICE_ROOT, auth=auth)
 
     @property
     def rnr_api(self):
@@ -77,8 +78,8 @@
             return cached_reviews
 
         try:
-            fresh_reviews = self.rnr_api.get_reviews(packagename=package_name,
-                distroseries=distroseries, page=page)
+            fresh_reviews = self.rnr_api.get_reviews(
+                packagename=package_name, distroseries=distroseries, page=page)
         except (ValidationException, APIError):
             fresh_reviews = []
         cache.set(key, fresh_reviews, settings.REVIEWS_CACHE_TIMEOUT)
@@ -112,7 +113,7 @@
             if response.getcode() == 200:
                 data = json.loads(response.read())
                 fresh_screenshots = [entry['large_image_url']
-                    for entry in data.get('screenshots', [])]
+                                     for entry in data.get('screenshots', [])]
         except (IOError, ValueError, TypeError):
             pass
         cache.set(key, fresh_screenshots, settings.REVIEWS_CACHE_TIMEOUT)
@@ -150,12 +151,12 @@
                 token=token, consumer_key=openid_identifier)
 
         if result:
-            authorizer = OAuthAuthorizer(token_key=result['token'],
-                token_secret=result['token_secret'],
+            authorizer = OAuthAuthorizer(
+                token_key=result['token'], token_secret=result['token_secret'],
                 consumer_key=result['consumer_key'],
                 consumer_secret=result['consumer_secret'])
             api = SingleSignOnAPI(service_root=settings.SSO_API_SERVICE_ROOT,
-                auth=authorizer)
+                                  auth=authorizer)
             me = api.me()
             data = {
                 'displayname': me.displayname,
@@ -176,7 +177,7 @@
 
 def full_claimed_id(consumer_key):
     return '%s/+id/%s' % (settings.OPENID_SSO_SERVER_URL.strip('/'),
-        consumer_key)
+                          consumer_key)
 
 
 class UserAgentString(object):
 
=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2012-06-06 12:54:15 +0000
+++ src/webcatalog/views.py	2012-06-06 17:47:19 +0000
@@ -20,7 +20,7 @@
 from __future__ import (
     absolute_import,
     with_statement,
-    )
+)
 
 import json
 import operator
@@ -35,12 +35,12 @@
 from django.http import (
     HttpResponseRedirect,
     HttpResponse,
-    )
+)
 from django.shortcuts import (
     get_list_or_404,
     get_object_or_404,
     render_to_response,
-    )
+)
 from django.template import RequestContext
 from django.utils.translation import ugettext as _
 
@@ -50,7 +50,7 @@
     Department,
     DistroSeries,
     Exhibit,
-    )
+)
 from webcatalog.utilities import WebServices
 
 
@@ -62,7 +62,7 @@
     'index',
     'department_overview',
     'search',
-    ]
+]
 
 
 def _get_page_num_from_request(request, paginator):
@@ -91,9 +91,10 @@
                 apps = Application.objects.filter(is_latest=True)
             apps = apps.filter(reduce(operator.or_, ors)).order_by('name')
 
-    crumbs = [{'name': 'All Apps', 'url': reverse('wc-index')},
-              {'name': 'Search results', 'url': request.build_absolute_uri()},
-             ]
+    crumbs = [
+        {'name': 'All Apps', 'url': reverse('wc-index')},
+        {'name': 'Search results', 'url': request.build_absolute_uri()},
+    ]
 
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)
@@ -104,16 +105,15 @@
         'breadcrumbs': crumbs,
         'available_distroseries': DistroSeries.objects.order_by('-code_name'),
         'distroseries': distro,
-        })
+    })
     return render_to_response('webcatalog/search_results.html',
-        context_instance=context)
+                              context_instance=context)
 
 
 def index(request):
     depts = Department.objects.filter(parent=None).order_by('name')
-    depts = depts.order_by('name')
-    exhibits = list(Exhibit.objects.filter(Q(display=True) |
-        Q(display=None, published=True,)).order_by('weight'))
+    qs = Q(display=True) | Q(display=None, published=True,)
+    exhibits = list(Exhibit.objects.filter(qs).order_by('weight'))
     featured_apps = [Application.objects.find_best(package_name=app)
                      for app in settings.FEATURED_APPS]
     featured_apps = [x for x in featured_apps if x]
@@ -138,7 +138,7 @@
         'top_rated_apps': top_rated,
     })
     return render_to_response('webcatalog/index.html',
-        context_instance=context)
+                              context_instance=context)
 
 
 def department_overview(request, dept_slug_or_id=None, distro=None):
@@ -159,15 +159,16 @@
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)
 
-    context = RequestContext(request, dict={'dept': dept,
+    context = {
+        'dept': dept,
         'subdepts': subdepts,
         'page': paginator.page(page_num),
         'breadcrumbs': dept.crumbs(),
         'available_distroseries': DistroSeries.objects.order_by('-code_name'),
         'distroseries': distro,
-        })
+    }
     return render_to_response('webcatalog/department_overview.html',
-        context_instance=context)
+                              context_instance=RequestContext(request, context))
 
 
 def application_list(request):
@@ -185,9 +186,10 @@
 
     depts = Department.objects.filter(parent=None).order_by('name')
 
+    context = RequestContext(request,
+                             dict(applications=applications, depts=depts))
     return render_to_response('webcatalog/application_list.html',
-        context_instance=RequestContext(request,
-            dict(applications=applications, depts=depts)))
+                              context_instance=context)
 
 
 def application_detail(request, package_name, distro=None):
@@ -212,7 +214,8 @@
 
     hib_apps = getattr(settings, 'HIB_APPS', [])
 
-    atts = {'application': app,
+    atts = {
+        'application': app,
         'available_distroseries': app.available_distroseries(),
         'breadcrumbs': app.crumbs(),
         'distroseries': distro,
@@ -221,7 +224,7 @@
         'email_form': form,
         'debtags': debtags,
         'display_hib_widget': app.package_name in hib_apps
-        }
+    }
 
     return render_to_response(
         'webcatalog/application_detail.html', RequestContext(
@@ -235,12 +238,12 @@
     # unity-lens-utilities, probably via a myapps PPA as well as extras?).
     # Don't break when this happens.
     apps = get_list_or_404(Application, package_name=package_name,
-                            distroseries__code_name=distro)
+                           distroseries__code_name=distro)
     app = apps[0]
 
     # XXX michaeln 2011-09-15 bug=851662 Better review language options.
-    reviews = WebServices().get_reviews_for_package(package_name,
-        distroseries=distro, page=page)
+    reviews = WebServices().get_reviews_for_package(
+        package_name, distroseries=distro, page=page)
 
     context = dict(application=app, reviews=reviews)
     if ajax:
@@ -277,8 +280,7 @@
 def application_screenshots(request, package_name):
     app = Application.objects.find_best_or_404(package_name=package_name)
     screenshots = WebServices().get_screenshots_for_package(package_name)
-    return HttpResponse(json.dumps(screenshots),
-        mimetype='application/json')
+    return HttpResponse(json.dumps(screenshots), mimetype='application/json')
 
 
 def combo_view(request):
@@ -291,8 +293,9 @@
             content_type = "text/javascript"
         elif fnames[0].endswith(".css"):
             content_type = "text/css"
-        content = combine_files(fnames, os.path.abspath(settings.CONVOY_ROOT),
-              resource_prefix=settings.MEDIA_URL, rewrite_urls=True)
+        content = combine_files(
+            fnames, os.path.abspath(settings.CONVOY_ROOT),
+            resource_prefix=settings.MEDIA_URL, rewrite_urls=True)
         # We're turning the generator returned by combine_files into a string
         # here since GZipMiddleware would consume it if not. See Bug #822888.
         return HttpResponse(
 
=== modified file 'src/webcatalog/wsgi.py'
--- src/webcatalog/wsgi.py	2012-03-30 13:22:36 +0000
+++ src/webcatalog/wsgi.py	2012-06-06 17:47:19 +0000
@@ -37,6 +37,6 @@
     logging.config.fileConfig(settings.WEBAPP_LOGGING_CONFIG)
     oops_dir = getattr(settings, 'OOPS_DIR', '/tmp')
     oops_app = OopsWare(WSGIHandler(), oops_dir=oops_dir,
-        key=appserver_id, hide_meta=True)
+                        key=appserver_id, hide_meta=True)
     oops_app.serial = OOPSRFC822Serializer(appserver_id, oops_dir, None)
     return oops_app