Merge lp:~cjohnston/summit/flake8-common into lp:summit

[Chris Johnston]

Just some flake8 fixes for summit

Unmerged revisions

555. By Chris Johnston <email address hidden> on 2013-05-14

Flake8 fixes for common

=== modified file 'summit/common/admin/menuadmin.py'
--- summit/common/admin/menuadmin.py	2012-03-08 01:45:05 +0000
+++ summit/common/admin/menuadmin.py	2013-07-08 13:28:38 +0000
@@ -1,10 +1,12 @@
 from django.contrib import admin
 from common.models import Menu, MenuItem
 
+
 class MenuItemInline(admin.TabularInline):
     model = MenuItem
 
+
 class MenuAdmin(admin.ModelAdmin):
-    inlines = [MenuItemInline,]
+    inlines = [MenuItemInline, ]
 
 admin.site.register(Menu, MenuAdmin)

=== modified file 'summit/common/context_processors.py'
--- summit/common/context_processors.py	2013-03-07 01:48:40 +0000
+++ summit/common/context_processors.py	2013-07-08 13:28:38 +0000
@@ -14,9 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# context processors for The Summit Scheduler
-# see http://docs.djangoproject.com/en/dev/ref/settings/#setting-TEMPLATE_CONTEXT_PROCESSORS
-
 from schedule.models.summitmodel import Summit
 
 from django.conf import settings

=== modified file 'summit/common/forms.py'
--- summit/common/forms.py	2012-01-25 19:47:36 +0000
+++ summit/common/forms.py	2013-07-08 13:28:38 +0000
@@ -1,13 +1,13 @@
 from django.template import Context, loader
 from django import forms
-from django.utils.translation import ugettext as _
+
 
 # Taken from http://djangosnippets.org/snippets/1732/
 class RenderableMixin(object):
     """
     Mixin to render forms from a predefined template
     """
-    
+
     @property
     def form_class_name(self):
         return '.'.join([self.__module__, self.__class__.__name__.lower()])
@@ -23,7 +23,12 @@
 
         context_dict = dict(
             non_field_errors=self.non_field_errors(),
-            fields=[ forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()],
+            fields=[
+                forms.forms.BoundField(
+                    self,
+                    field,
+                    name,
+                ) for name, field in self.fields.iteritems()],
             errors=self.errors,
             data=self.data,
             form=self,

=== modified file 'summit/common/launchpad.py'
--- summit/common/launchpad.py	2013-02-04 23:22:10 +0000
+++ summit/common/launchpad.py	2013-07-08 13:28:38 +0000
@@ -38,7 +38,10 @@
     html = f.read()
     services = OpenIDServiceEndpoint().fromHTML(url, html)
     if services is not None and len(services) > 0:
-        services[0].local_id = services[0].local_id.replace('launchpad.net', 'ubuntu.com')
+        services[0].local_id = services[0].local_id.replace(
+            'launchpad.net',
+            'ubuntu.com',
+        )
         return services[0]
     else:
         return None

=== modified file 'summit/common/management/commands/release.py'
--- summit/common/management/commands/release.py	2013-05-06 21:00:28 +0000
+++ summit/common/management/commands/release.py	2013-07-08 13:28:38 +0000
@@ -7,6 +7,7 @@
 import sys
 import os
 
+
 def write_version_strings(version):
     try:
         from bzrlib.branch import Branch
@@ -25,6 +26,7 @@
     f.close()
     return (version, bzr_revno)
 
+
 class Command(LabelCommand):
     help = "Prepare release of The Summit Scheduler. Please pass <version> as an argument."
 

=== modified file 'summit/common/models.py'
--- summit/common/models.py	2012-10-02 18:07:24 +0000
+++ summit/common/models.py	2013-07-08 13:28:38 +0000
@@ -3,6 +3,7 @@
 from django.contrib.sites.models import Site
 from django.contrib.sites.managers import CurrentSiteManager
 
+
 class Menu(models.Model):
     name = models.CharField(max_length=100)
     slug = models.SlugField()
@@ -19,12 +20,12 @@
     def save(self, force_insert=False, force_update=False):
         """
         Re-order all items from 10 upwards, at intervals of 10.
-        This makes it easy to insert new items in the middle of 
-        existing items without having to manually shuffle 
+        This makes it easy to insert new items in the middle of
+        existing items without having to manually shuffle
         them all around.
         """
         super(Menu, self).save(force_insert, force_update)
-        
+
         current = 10
         for item in MenuItem.objects.filter(menu=self).order_by('order'):
             item.order = current
@@ -35,10 +36,19 @@
 class MenuItem(models.Model):
     menu = models.ForeignKey(Menu)
     order = models.IntegerField()
-    link_url = models.CharField(max_length=100, help_text='URL or URI to the content, eg /about/ or http://foo.com/')
+    link_url = models.CharField(
+        max_length=100,
+        help_text='URL or URI to the content, eg /about/ or http://foo.com/',
+    )
     title = models.CharField(max_length=100)
-    login_required = models.BooleanField(blank=True, help_text='Should this item only be shown to authenticated users?')
-    anonymous_only = models.BooleanField(blank=True, help_text='Should this item only be shown to non-logged-in users?')
-    
+    login_required = models.BooleanField(
+        blank=True,
+        help_text='Should this item only be shown to authenticated users?',
+    )
+    anonymous_only = models.BooleanField(
+        blank=True,
+        help_text='Should this item only be shown to non-logged-in users?',
+    )
+
     def __unicode__(self):
         return "%s %s. %s" % (self.menu.slug, self.order, self.title)

=== modified file 'summit/common/templatetags/menubuilder.py'
--- summit/common/templatetags/menubuilder.py	2012-10-06 01:42:35 +0000
+++ summit/common/templatetags/menubuilder.py	2013-07-08 13:28:38 +0000
@@ -4,6 +4,7 @@
 
 register = template.Library()
 
+
 def build_menu(parser, token):
     """
     {% menu menu_name %}
@@ -11,9 +12,12 @@
     try:
         tag_name, menu_name = token.split_contents()
     except:
-        raise template.TemplateSyntaxError, "%r tag requires exactly one argument" % token.contents.split()[0]
+        raise template.TemplateSyntaxError, (
+            "%r tag requires exactly one argument" % token.contents.split()[0]
+        )
     return MenuObject(menu_name)
 
+
 class MenuObject(template.Node):
     def __init__(self, menu_name):
         self.menu_name = menu_name
@@ -27,12 +31,14 @@
         context['menuitems'] = get_items(real_menu_name, current_path, user)
         return ''
 
+
 def build_sub_menu(parser, token):
     """
     {% submenu %}
     """
     return SubMenuObject()
 
+
 class SubMenuObject(template.Node):
     def __init__(self):
         pass
@@ -52,11 +58,13 @@
             context['submenu_items'] = context['submenu'] = None
         return ''
 
+
 def get_items(menu_name, current_path, user):
     """
-    If possible, use a cached list of items to avoid continually re-querying 
+    If possible, use a cached list of items to avoid continually re-querying
     the database.
-    The key contains the menu name, whether the user is authenticated, and the current path.
+    The key contains the menu name, whether the user is authenticated, and the
+    current path.
     Disable caching by setting MENU_CACHE_TIME to -1.
     """
     from django.conf import settings
@@ -64,26 +72,46 @@
     debug = getattr(settings, 'DEBUG', False)
 
     if cache_time >= 0 and not debug:
-        cache_key = 'django-menu-items/%s/%s/%s'  % (menu_name, current_path, user.is_authenticated())
+        cache_key = 'django-menu-items/%s/%s/%s' % (
+            menu_name,
+            current_path,
+            user.is_authenticated(),
+        )
         menuitems = cache.get(cache_key, [])
         if menuitems:
             return menuitems
     else:
         menuitems = []
-        
+
     try:
         menu = Menu.objects.get(slug=menu_name)
     except Menu.DoesNotExist:
         return []
 
     for i in MenuItem.objects.filter(menu=menu).order_by('order'):
-        current = ( i.link_url != '/' and current_path.startswith(i.link_url)) or ( i.link_url == '/' and current_path == '/' )
-        if menu.base_url and i.link_url == menu.base_url and current_path != i.link_url:
+        current = (
+            i.link_url != '/' and current_path.startswith(i.link_url)
+        ) or (
+            i.link_url == '/' and current_path == '/'
+        )
+        if (
+            menu.base_url and i.link_url == menu.base_url
+        ) and (
+            current_path != i.link_url
+        ):
             current = False
         show_anonymous = i.anonymous_only and user.is_anonymous()
         show_auth = i.login_required and user.is_authenticated()
-        if (not (i.login_required or i.anonymous_only)) or (i.login_required and show_auth) or (i.anonymous_only and show_anonymous):
-            menuitems.append({'url': i.link_url, 'title': i.title, 'current': current,})
+        if (
+            not (i.login_required or i.anonymous_only)
+        ) or (
+            i.login_required and show_auth
+        ) or (
+            i.anonymous_only and show_anonymous
+        ):
+            menuitems.append(
+                {'url': i.link_url, 'title': i.title, 'current': current}
+            )
 
     if cache_time >= 0 and not debug:
         cache.set(cache_key, menuitems, cache_time)

=== modified file 'summit/common/templatetags/qrcode.py'
--- summit/common/templatetags/qrcode.py	2012-10-27 15:27:30 +0000
+++ summit/common/templatetags/qrcode.py	2013-07-08 13:28:38 +0000
@@ -1,14 +1,14 @@
 # Snippet from http://djangosnippets.org/snippets/1494/
 # Generate QR Code image from a string with the Google charts API
-# 
+#
 # http://code.google.com/intl/fr-FR/apis/chart/types.html#qrcodes
-# 
-# Exemple usage in a template
-# 
+#
+# Example usage in a template
+#
 # {{ my_string|qrcode:"my alt" }}
 # will return the image tag with
-# 
-# src: http://chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl=my_string&amp;choe=UTF-8
+#
+# src: http://goo.gl/KyAVB
 # Author:johnnoone
 # Posted:May 6, 2009
 # Language:Python
@@ -23,34 +23,41 @@
 
 register = template.Library()
 
+
 @register.filter
 @stringfilter
 def qrcode(value, alt=None):
     """
     Generate QR Code image from a string with the Google charts API
-    
+
     http://code.google.com/intl/fr-FR/apis/chart/types.html#qrcodes
-    
-    Exemple usage --
+
+    Example usage --
     {{ my_string|qrcode:"my alt" }}
-    
-    <img src="http://chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl=my_string&amp;choe=UTF-8" alt="my alt" />
+
     """
-    
-    url = conditional_escape("http://chart.apis.google.com/chart?%s" % \
-            urllib.urlencode({'chs':'150x150', 'cht':'qr', 'chl':value, 'choe':'UTF-8'}))
+
+    url = conditional_escape(
+        "http://chart.apis.google.com/chart?%s" % urllib.urlencode(
+            {'chs': '150x150', 'cht': 'qr', 'chl': value, 'choe': 'UTF-8'}
+        )
+    )
     alt = conditional_escape(alt or value)
-    
-    return mark_safe(u"""<img class="qrcode" src="%s" width="150" height="150" alt="%s" />""" % (url, alt))
+
+    return mark_safe(
+        u"""<img class="qrcode" src="%s" width="150" height="150" alt="%s" />""" % (url, alt)
+    )
+
 
 def build_qrhere(parser, token):
     """
     {% qrhere %}
-    
+
     Returns an <img> with a QR Code pointing to the current URL
     """
     return QRHere()
 
+
 class QRHere(template.Node):
     def __init__(self):
         pass
@@ -59,8 +66,18 @@
         if 'request' not in context:
             return ''
         current_url = '%s/%s' % (settings.SITE_ROOT, context['request'].path)
-        url = conditional_escape("http://chart.apis.google.com/chart?%s" % \
-            urllib.urlencode({'chs':'150x150', 'cht':'qr', 'chl':current_url, 'choe':'UTF-8'}))
-        return mark_safe(u"""<img class="qrcode" src="%s" width="150" height="150" />""" % url)
+        url = conditional_escape(
+            "http://chart.apis.google.com/chart?%s" % urllib.urlencode(
+                {
+                    'chs': '150x150',
+                    'cht': 'qr',
+                    'chl': current_url,
+                    'choe': 'UTF-8',
+                }
+            )
+        )
+        return mark_safe(
+            u"""<img class="qrcode" src="%s" width="150" height="150" />""" % url
+        )
 
 register.tag('qrhere', build_qrhere)

=== modified file 'summit/common/utils.py'
--- summit/common/utils.py	2013-01-19 22:29:21 +0000
+++ summit/common/utils.py	2013-07-08 13:28:38 +0000
@@ -7,7 +7,9 @@
     """
     value = value.lstrip('#')
     lv = len(value)
-    return tuple(int(value[i:i + lv / 3], 16) for i in range(0, lv, lv / 3)) + (0.5,)
+    return tuple(
+        int(value[i:i + lv / 3], 16) for i in range(0, lv, lv / 3)
+    ) + (0.5,)
 
 
 def redirect(to, *args, **kwargs):

=== modified file 'summit/common/views.py'
--- summit/common/views.py	2013-05-10 16:36:27 +0000
+++ summit/common/views.py	2013-07-08 13:28:38 +0000
@@ -47,9 +47,13 @@
         return render_to_response("common/no_summit.html")
 
 
-def login_failure(request, message, status=403,
-        template_name='login_failure.html',
-        exception=None):
+def login_failure(
+    request,
+    message,
+    status=403,
+    template_name='login_failure.html',
+    exception=None,
+):
     """Render an error page to the user."""
     context = {
         'message': message,
@@ -60,6 +64,9 @@
     elif isinstance(exception, MissingUsernameViolation):
         context['solution'] = 'You will need to create a <a href="https://launchpad.net/people/+me">Launchpad profile</a> to use The Summit Scheduler'
 
-    data = render_to_string(template_name, context,
-        context_instance=RequestContext(request))
+    data = render_to_string(
+        template_name,
+        context,
+        context_instance=RequestContext(request),
+    )
     return HttpResponse(data, status=status)

=== modified file 'summit/common/widgets.py'
--- summit/common/widgets.py	2013-04-08 20:50:49 +0000
+++ summit/common/widgets.py	2013-07-08 13:28:38 +0000
@@ -99,9 +99,7 @@
     """
     A more-friendly date/time widget.
 
-    Inspired by:
-
-    http://copiesofcopies.org/webl/2010/04/26/a-better-datetime-widget-for-django/
+    Inspired by: http://goo.gl/bul3W
     """
     def __init__(self, attrs=None, date_format=None, time_format=None):
         super(DateTimeWidget, self).__init__(attrs, date_format, time_format)