Make code PEP8 compliant

fancypages/abstract_models.py

@@ -53,12 +53,14 @@ def save(self, update_slugs=True, *args, **kwargs):
         super(AbstractTreeNode, self).save(*args, **kwargs)
 
     def move(self, target, pos=None):
+        #:PEP8 -E501
         """
         Moves the current node and all its descendants to a new position
         relative to another node.
 
-        See https://tabo.pe/projects/django-treebeard/docs/1.61/api.html#treebeard.models.Node.move
+        See https://tabo.pe/projects/django-treebeard/docs/1.61/api.html
         """
+        #:PEP8 +E501
         super(AbstractTreeNode, self).move(target, pos)
         # Update the slugs and full names of all nodes in the new subtree.
         # We need to reload self as 'move' doesn't update the current instance,

fancypages/api/serialisers.py

@@ -160,4 +160,4 @@ def save(self, *args, **kwargs):
     class Meta:
         model = FancyPage
         fields = ['parent', 'new_index', 'old_index']
-        read_only_fields = ['status',]
+        read_only_fields = ['status']

fancypages/api/urls.py

@@ -3,7 +3,8 @@
 from fancypages.api import views
 
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^$', views.ApiV2View.as_view(), name="api-root"),
     url(r'^blocks$', views.BlockListView.as_view(), name='block-list'),
     url(

fancypages/api/views.py

@@ -106,18 +106,16 @@ class BlockTypesView(APIView):
     def get(self, request):
         container_id = request.QUERY_PARAMS.get('container')
         if container_id is None:
-            return Response({
-                    'detail': u'container ID is required for block list',
-                },
+            return Response(
+                {'detail': u'container ID is required for block list'},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
         try:
             Container.objects.get(pk=container_id)
         except Container.DoesNotExist:
-            return Response({
-                    'detail': u'container ID is invalid',
-                },
+            return Response(
+                {'detail': u'container ID is invalid'},
                 status=status.HTTP_400_BAD_REQUEST,
             )
         return Response({

fancypages/assets/app.py

@@ -15,7 +15,8 @@ class AssetApplication(Application):
     def get_urls(self):
         urlpatterns = super(AssetApplication, self).get_urls()
 
-        urlpatterns += patterns('',
+        urlpatterns += patterns(
+            '',
             url(
                 r'^images/$',
                 self.image_list_view.as_view(),

fancypages/assets/forms/widgets.py

@@ -31,15 +31,21 @@ def render(self, name, value, attrs=None):
                 widget_value = None
             if id_:
                 final_attrs = dict(final_attrs, id='%s_%s' % (id_, i))
-            output.append(widget.render(self.get_widget_id(name, i), widget_value, final_attrs))
+            output.append(
+                widget.render(
+                    self.get_widget_id(name, i),
+                    widget_value,
+                    final_attrs
+                )
+            )
         rendered_widgets = mark_safe(self.format_output(output))
         tmpl = loader.get_template(self.template_name)
         return tmpl.render(Context({
             'rendered_widgets': rendered_widgets,
             'asset': self.get_asset(*value),
         }))
 
-    def get_widget_id (self, name, idx):
+    def get_widget_id(self, name, idx):
         return "%s_%s" % (name, self.widget_id_suffixes[idx])
 
     def value_from_datadict(self, data, files, name):

fancypages/assets/models.py

@@ -31,7 +31,7 @@ class ImageAsset(AbstractAsset):
     )
     width = models.IntegerField(_("Width"), blank=True)
     height = models.IntegerField(_("Height"), blank=True)
-    size = models.IntegerField(_("Size"), blank=True, null=True) # Bytes
+    size = models.IntegerField(_("Size"), blank=True, null=True)  # Bytes
 
     @property
     def asset_type(self):

fancypages/assets/views.py

@@ -45,7 +45,9 @@ def form_valid(self, form):
                 'name': f.name,
                 'url': self.object.get_absolute_url(),
                 'thumbnailMarkup': thumbnail_markup,
-                'deleteUrl': '', #reverse('upload-delete', args=[self.object.id]),
+                #TODO add the delete URL back in again
+                # reverse('upload-delete', args=[self.object.id]),
+                'deleteUrl': '',
                 'deleteType': 'DELETE',
             }]
         }

fancypages/dashboard/app.py

@@ -20,7 +20,8 @@ class FancypagesDashboardApplication(Application):
     block_delete_view = views.BlockDeleteView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urlpatterns = patterns(
+            '',
             url(r'^assets/', include(self.assets_app.urls)),
 
             url(

fancypages/dashboard/forms.py

@@ -34,7 +34,8 @@ def set_field_choices(self):
         if 'page_type' in self.fields:
             self.fields['page_type'].queryset = PageType.objects.all()
         if 'visibility_types' in self.fields:
-            self.fields['visibility_types'].queryset = VisibilityType.objects.all()
+            self.fields['visibility_types'].queryset = \
+                VisibilityType.objects.all()
 
 
 class PageForm(PageFormMixin, forms.ModelForm):

fancypages/dashboard/views.py

@@ -143,8 +143,10 @@ def get_object(self, queryset=None):
         return self.get_block_object()
 
     def delete(self, request, *args, **kwargs):
-        response = super(BlockDeleteView, self).delete(request, *args, **kwargs)
-        for idx, block in enumerate(self.object.container.blocks.all().select_subclasses()):
+        response = super(BlockDeleteView, self).delete(request, *args,
+                                                       **kwargs)
+        blocks = self.object.container.blocks.all().select_subclasses()
+        for idx, block in enumerate(blocks):
             block.display_order = idx
             block.save()
         return response

fancypages/forms.py

@@ -34,7 +34,8 @@ def set_field_choices(self):
         if 'page_type' in self.fields:
             self.fields['page_type'].queryset = PageType.objects.all()
         if 'visibility_types' in self.fields:
-            self.fields['visibility_types'].queryset = VisibilityType.objects.all()
+            self.fields['visibility_types'].queryset = \
+                VisibilityType.objects.all()
 
     def save_category_data(self, category):
         category.name = self.cleaned_data['name']

fancypages/middleware.py

@@ -11,7 +11,8 @@ def replace_insensitive(string, target, replacement):
     """
     Similar to string.replace() but is case insensitive
     Code borrowed from:
-    http://forums.devshed.com/python-programming-11/case-insensitive-string-replace-490921.html
+    http://forums.devshed.com/python-programming-11/
+            case-insensitive-string-replace-490921.html
     """
     no_case = string.lower()
     index = no_case.rfind(target.lower())
@@ -53,10 +54,10 @@ def process_response(self, request, response):
             smart_unicode(editor_head) + self.head_tag,
         )
 
-	response.content = BODY_STARTTAG.sub(
-	    r'\g<body_tag><div class="editable-page-wrapper">',
-	    response.content
-	)
+        response.content = BODY_STARTTAG.sub(
+            r'\g<body_tag><div class="editable-page-wrapper">',
+            response.content
+        )
 
         editor_body = render_to_string(
             self.body_template_name,

fancypages/mixins.py

@@ -33,7 +33,9 @@ def get_json_response(self, content, **httpresponse_kwargs):
             content_type=self.get_content_type(),
             **httpresponse_kwargs
         )
-        response['Content-Disposition'] = 'inline; filename=%s' % self.json_filename
+        response['Content-Disposition'] = 'inline; filename={0}'.format(
+            self.json_filename
+        )
         return response
 
     def convert_context_to_json(self, context):

fancypages/models/blocks/content.py

@@ -95,8 +95,10 @@ class ImageAndTextBlock(ImageMetadataMixin, ContentBlock):
 
     def __unicode__(self):
         if self.image_asset:
-            return u"Image with text '%s'" % os.path.basename(self.image_asset.image.path)
-        return u"Image with text #%s" % self.id
+            return u"Image with text '{0}'".format(
+                os.path.basename(self.image_asset.image.path)
+            )
+        return u"Image with text #{0}".format(self.id)
 
     class Meta:
         app_label = 'fancypages'
@@ -119,7 +121,9 @@ def get_images_and_links(self):
             image_id = getattr(self, "%s_id" % (self.image_field_name % idx))
             link_field_name = self.link_field_name % idx
             if image_id:
-                results[image_id] = {'link': getattr(self, link_field_name, None)}
+                results[image_id] = {
+                    'link': getattr(self, link_field_name, None)
+                }
                 query.add(models.Q(id=image_id), models.Q.OR)
         if not query:
             return {}

fancypages/urls.py

@@ -5,7 +5,8 @@
 from fancypages.app import application as fancypages_app
 from fancypages.dashboard.app import application as dashboard_app
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'dashboard/fancypages/', include(dashboard_app.urls)),
     url(
         API_BASE_URL,

fancypages/views.py

@@ -19,7 +19,8 @@ class FancyPageDetailView(PageMixin, DetailView):
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        response = super(FancyPageDetailView, self).get(request, *args, **kwargs)
+        response = super(FancyPageDetailView, self).get(request, *args,
+                                                        **kwargs)
         if request.user.is_staff:
             return response