Clean up according to PEP8

fancypages/app.py

@@ -11,7 +11,8 @@ class FancypagesApplication(Application):
     page_view = views.FancyPageDetailView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urlpatterns = patterns(
+            '',
             url(
                 r'^(?P<slug>[\w-]+(/[\w-]+)*)/$',
                 self.page_view.as_view(),

fancypages/defaults.py

@@ -32,8 +32,8 @@
 ########## END COMPRESSOR SETTINGS
 
 ########## TWITTER TAG SETTINGS
-TWITTER_OAUTH_TOKEN=''
-TWITTER_OAUTH_SECRET=''
-TWITTER_CONSUMER_KEY=''
-TWITTER_CONSUMER_SECRET=''
+TWITTER_OAUTH_TOKEN = ''
+TWITTER_OAUTH_SECRET = ''
+TWITTER_CONSUMER_KEY = ''
+TWITTER_CONSUMER_SECRET = ''
 ########## END TWITTER TAG SETTINGS

fancypages/middleware.py

@@ -17,7 +17,7 @@ def replace_insensitive(string, target, replacement):
     index = no_case.rfind(target.lower())
     if index >= 0:
         return string[:index] + replacement + string[index + len(target):]
-    else: # no results so return the original string
+    else:  # no results so return the original string
         return string
 
 

fancypages/templatetags/fp_block_tags.py

@@ -82,7 +82,8 @@ def get_content_type(obj):
 
 
 ##TODO need re-write due to new registered blocks
-@register.inclusion_tag('fancypages/dashboard/block_select.html', takes_context=True)
+@register.inclusion_tag('fancypages/dashboard/block_select.html',
+                        takes_context=True)
 def render_block_selection(context):
     request = context.get('request')
     if not request or not request.fancypages_edit_mode:

fancypages/templatetags/fp_container_tags.py

@@ -76,8 +76,9 @@ def fp_container(parser, token):
 
     if len(args) != 2:
         raise template.TemplateSyntaxError(
-            "%r tag expects a single argument container" \
-            % token.contents.split()[0]
+            "{0} tag expects a single argument container".format(
+                token.contents.split()[0]
+            )
         )
 
     tag_name, args = args[:1], args[1:]

fancypages/templatetags/fp_sitemap_tags.py

@@ -34,19 +34,24 @@ def build_tree(root, parent, data, depth, instance_type):
 @register.assignment_tag
 def get_pages(visibility_type):
     try:
-        visibility_type_instance = VisibilityType.objects.get(slug=visibility_type)
+        visibility_type_instance = VisibilityType.objects.get(
+            slug=visibility_type
+        )
     except VisibilityType.DoesNotExist:
         return Page.objects.none()
     return Page.object.visible_in(visibility_type_instance)
 
 
 @register.assignment_tag
-def get_site_tree(visibility_type=None, depth=1, instance_type=INSTANCE_TYPE_PAGE):
+def get_site_tree(visibility_type=None, depth=1,
+                  instance_type=INSTANCE_TYPE_PAGE):
     if instance_type not in INSTANCE_TYPES:
         return []
 
     try:
-        visibility_type_instance = VisibilityType.objects.get(slug=visibility_type)
+        visibility_type_instance = VisibilityType.objects.get(
+            slug=visibility_type
+        )
     except VisibilityType.DoesNotExist:
         visibility_type_instance = None
         if visibility_type:

fancypages/templatetags/verbatim.py

@@ -1,16 +1,17 @@
 from django import template
- 
+
 register = template.Library()
- 
- 
+
+
 class VerbatimNode(template.Node):
- 
+
     def __init__(self, text):
         self.text = text
+
     def render(self, context):
         return self.text
- 
- 
+
+
 @register.tag
 def verbatim(parser, token):
     text = []
@@ -29,4 +30,4 @@ def verbatim(parser, token):
             if not text[-1].startswith('='):
                 text[-1:-1] = [' ']
             text.append(' %}')
-    return VerbatimNode(''.join(text))    
+    return VerbatimNode(''.join(text))

fancypages/utils/decorators.py

@@ -37,7 +37,7 @@ def _checklogin(request, *args, **kwargs):
             login_scheme, login_netloc = urlparse.urlparse(login_url)[:2]
             current_scheme, current_netloc = urlparse.urlparse(path)[:2]
             if ((not login_scheme or login_scheme == current_scheme) and
-                (not login_netloc or login_netloc == current_netloc)):
+                    (not login_netloc or login_netloc == current_netloc)):
                 path = request.get_full_path()
 
             messages.warning(request, _("You must log in to access this page"))

setup.py

@@ -32,10 +32,10 @@
     ],
     # See http://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
-      'Environment :: Web Environment',
-      'Intended Audience :: Developers',
-      'License :: OSI Approved :: BSD License',
-      'Operating System :: Unix',
-      'Programming Language :: Python',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: Unix',
+        'Programming Language :: Python',
     ]
 )

tests/unit/blocks/test_text_block.py

@@ -16,8 +16,7 @@ def setUp(self):
         self.request_context['user'] = self.user
 
     def test_can_be_rendered_in_template(self):
-        block = factories.TextBlockFactory.build()
-        block.id = 666
+        block = factories.TextBlockFactory.build(id=6)
         renderer = block.get_renderer_class()(block, self.request_context)
         block_html = renderer.render()