Fix all flake8 2.1.0 warnings

matthiask · matthiask · commit b6c0d066aff1 · 2014-04-12T17:35:09.000+02:00
diff --git a/feincms/__init__.py b/feincms/__init__.py
@@ -78,9 +78,9 @@ def ensure_completely_loaded(force=False):
     # See Issue #323 on github.
     if hasattr(loading, 'cache'):
         try:
-            loading.cache.get_models.cache_clear() # Django 1.7+
+            loading.cache.get_models.cache_clear()  # Django 1.7+
         except AttributeError:
-            loading.cache._get_models_cache.clear() # Django 1.6-
+            loading.cache._get_models_cache.clear()  # Django 1.6-
 
     if hasattr(loading.app_cache_ready, '__call__'):
         if loading.app_cache_ready():
diff --git a/feincms/admin/item_editor.py b/feincms/admin/item_editor.py
@@ -333,7 +333,7 @@ def get_fieldsets(self, request, obj=None):
         fieldsets = copy.deepcopy(
             super(ItemEditor, self).get_fieldsets(request, obj))
 
-        if not FEINCMS_CONTENT_FIELDSET_NAME in dict(fieldsets).keys():
+        if FEINCMS_CONTENT_FIELDSET_NAME not in dict(fieldsets).keys():
             fieldsets.append(FEINCMS_CONTENT_FIELDSET)
 
         return fieldsets
diff --git a/feincms/admin/tree_editor.py b/feincms/admin/tree_editor.py
@@ -353,7 +353,7 @@ def _toggle_boolean(self, request):
 
         self._collect_editable_booleans()
 
-        if not attr in self._ajax_editable_booleans:
+        if attr not in self._ajax_editable_booleans:
             return HttpResponseBadRequest("not a valid attribute %s" % attr)
 
         try:
diff --git a/feincms/content/comments/models.py b/feincms/content/comments/models.py
@@ -81,8 +81,8 @@ def process(self, request, **kwargs):
             # post to the current path and handle it this way .. at least it
             # works for now.
 
-            #extra = request._feincms_extra_context.get('page_extra_path', ())
-            #if len(extra) > 0 and extra[0] == "post-comment":
+            # extra = request._feincms_extra_context.get('page_extra_path', ())
+            # if len(extra) > 0 and extra[0] == "post-comment":
 
             r = post_comment(request, next=comment_page.get_absolute_url())
 
diff --git a/feincms/models.py b/feincms/models.py
@@ -412,8 +412,8 @@ def _template(self):
                 cls.template = property(_template)
 
             cls.TEMPLATE_CHOICES = field._choices = [
-                (template.key, template.title,)
-                for template in cls._feincms_templates.values()
+                (template_.key, template_.title,)
+                for template_ in cls._feincms_templates.values()
             ]
             field.default = field.choices[0][0]
 
diff --git a/feincms/module/extensions/ct_tracker.py b/feincms/module/extensions/ct_tracker.py
@@ -79,7 +79,7 @@ def _fetch_content_type_counts(self):
 
     def _translation_map(self):
         cls = self.item.__class__
-        if not cls in _translation_map_cache:
+        if cls not in _translation_map_cache:
             # Prime translation map and cache it in the class. This needs to be
             # done late as opposed to at class definition time as not all
             # information is ready, especially when we are doing a "syncdb" the
diff --git a/feincms/module/medialibrary/modeladmins.py b/feincms/module/medialibrary/modeladmins.py
@@ -42,7 +42,7 @@ class CategoryAdmin(admin.ModelAdmin):
     prepopulated_fields = {'slug': ('title',)}
 
 
-#-------------------------------------------------------------------------
+# ------------------------------------------------------------------------
 def assign_category(modeladmin, request, queryset):
     class AddCategoryForm(forms.Form):
         _selected_action = forms.CharField(widget=forms.MultipleHiddenInput)
@@ -84,7 +84,7 @@ class AddCategoryForm(forms.Form):
 assign_category.short_description = _('Add selected media files to category')
 
 
-#-------------------------------------------------------------------------
+# -------------------------------------------------------------------------
 def save_as_zipfile(modeladmin, request, queryset):
     from .zip import export_zipfile
 
diff --git a/feincms/module/medialibrary/models.py b/feincms/module/medialibrary/models.py
@@ -267,5 +267,3 @@ class Meta:
 
     def __str__(self):
         return self.caption
-
-#-------------------------------------------------------------------------
diff --git a/feincms/module/mixins.py b/feincms/module/mixins.py
@@ -44,7 +44,7 @@ def register_response_processor(cls, fn, key=None):
             cls.response_processors = SortedDict()
         cls.response_processors[fn if key is None else key] = fn
 
-   # Implement admin_urlname templatetag protocol
+    # TODO Implement admin_urlname templatetag protocol
     @property
     def app_label(self):
         """
diff --git a/feincms/module/page/extensions/navigation.py b/feincms/module/page/extensions/navigation.py
@@ -101,7 +101,7 @@ def children(self, page, **kwargs):
 def navigation_extension_choices():
     for ext in NavigationExtension.types:
         if (issubclass(ext, NavigationExtension)
-                and not ext is NavigationExtension):
+                and ext is not NavigationExtension):
             yield ('%s.%s' % (ext.__module__, ext.__name__), ext.name)
 
 
diff --git a/feincms/module/page/modeladmins.py b/feincms/module/page/modeladmins.py
@@ -215,14 +215,14 @@ def is_visible_admin(self, page):
             # Sanity check in case this is not already defined
             self._visible_pages = list()
 
-        if page.parent_id and not page.parent_id in self._visible_pages:
+        if page.parent_id and page.parent_id not in self._visible_pages:
             # parent page's invisibility is inherited
             if page.id in self._visible_pages:
                 self._visible_pages.remove(page.id)
             return tree_editor.ajax_editable_boolean_cell(
                 page, 'active', override=False, text=_('inherited'))
 
-        if page.active and not page.id in self._visible_pages:
+        if page.active and page.id not in self._visible_pages:
             # is active but should not be shown, so visibility limited by
             # extension: show a "not active"
             return tree_editor.ajax_editable_boolean_cell(
diff --git a/feincms/module/page/processors.py b/feincms/module/page/processors.py
@@ -47,7 +47,7 @@ def frontendediting_request_processor(page, request):
     Sets the frontend editing state in the cookie depending on the
     ``frontend_editing`` GET parameter and the user's permissions.
     """
-    if not 'frontend_editing' in request.GET:
+    if 'frontend_editing' not in request.GET:
         return
 
     response = HttpResponseRedirect(request.path)
diff --git a/feincms/utils/__init__.py b/feincms/utils/__init__.py
@@ -58,8 +58,8 @@ def copy_model_instance(obj, exclude=None):
     exclude = exclude or ()
     initial = dict(
         (f.name, getattr(obj, f.name)) for f in obj._meta.fields
-        if not isinstance(f, AutoField) and not f.name in exclude
-        and not f in obj._meta.parents.values())
+        if not isinstance(f, AutoField) and f.name not in exclude
+        and f not in obj._meta.parents.values())
     return obj.__class__(**initial)
 
 
diff --git a/tests/testapp/tests/test_cms.py b/tests/testapp/tests/test_cms.py
@@ -79,11 +79,11 @@ def _new_parse(link):
 
         self.assertTrue('yahoo' in obj.render())
 
-    #Creating a content type twice isn't forbidden anymore
-    #def test_03_double_creation(self):
-    #    # creating a content type twice is forbidden
-    #    self.assertRaises(ImproperlyConfigured,
-    #        lambda: ExampleCMSBase.create_content_type(RawContent))
+    # Creating a content type twice isn't forbidden anymore
+    # def test_03_double_creation(self):
+    #     # creating a content type twice is forbidden
+    #     self.assertRaises(ImproperlyConfigured,
+    #         lambda: ExampleCMSBase.create_content_type(RawContent))
 
     def test_04_mediafilecontent_creation(self):
         # the medialibrary needs to be enabled, otherwise this test fails
@@ -173,7 +173,7 @@ class Attachment(models.Model):
 
         self.assertTrue(Attachment in related_models)
         self.assertTrue(hasattr(ExampleCMSBase, 'test_related_name'))
-        #self.assertFalse(hasattr(Attachment, 'anycontents'))
+        # self.assertFalse(hasattr(Attachment, 'anycontents'))
 
         class AnyContent(models.Model):
             attachment = models.ForeignKey(
diff --git a/tests/testapp/tests/test_page.py b/tests/testapp/tests/test_page.py
@@ -342,7 +342,7 @@ def create_page_through_admincontent(self, page, **kwargs):
         data = {
             'title': page.title,
             'slug': page.slug,
-            #'parent': page.parent_id, # this field is excluded from the form
+            # 'parent': page.parent_id,  # this field is excluded from the form
             'template_key': page.template_key,
             'publication_date_0': '2009-01-01',
             'publication_date_1': '00:00:00',

Original file line number	Diff line number	Diff line change
`@@ -412,8 +412,8 @@ def _template(self):`
`412`	`412`	`cls.template = property(_template)`
`413`	`413`
`414`	`414`	`cls.TEMPLATE_CHOICES = field._choices = [`
`415`		`- (template.key, template.title,)`
`416`		`- for template in cls._feincms_templates.values()`
	`415`	`+ (template_.key, template_.title,)`
	`416`	`+ for template_ in cls._feincms_templates.values()`
`417`	`417`	`]`
`418`	`418`	`field.default = field.choices[0][0]`
`419`	`419`