style: fix flake8 errors

dbischof · Sep 9, 2020 · 433cee9 · 433cee9
1 parent 1ae2b1b
commit 433cee9
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 27 deletions.
diff --git a/docs/docs_settings.py b/docs/docs_settings.py
@@ -1,16 +1,18 @@
+# flake8: noqa
+
 """
 This is the local_settings file for Mezzanine's docs.
 """
 
-from mezzanine.project_template.project_name.settings import *  # noqa
+from random import choice
+
+from mezzanine.project_template.project_name.settings import *
 
 DEBUG = False
 ROOT_URLCONF = "mezzanine.project_template.project_name.urls"
 
-# Generate a SECRET_KEY for this build
-from random import choice
-
 characters = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)"
+# Generate a SECRET_KEY for this build
 SECRET_KEY = "".join([choice(characters) for i in range(50)])
 
 if "mezzanine.accounts" not in INSTALLED_APPS:

diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py
@@ -49,7 +49,7 @@ def request(self, path, data=None):
         try:
             response = json.loads(r.text)
             return response
-        except:
+        except:  # noqa
             raise CommandError(r.text)
 
     def handle_import(self, options):

diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py
@@ -54,11 +54,11 @@ def handle_import(self, options):
                 from BeautifulSoup import BeautifulSoup
             except ImportError:
                 raise CommandError("BeautifulSoup package is required")
-            for l in BeautifulSoup(urlopen(page_url).read()).findAll("link"):
-                if "application/rss" in l.get(
+            for link in BeautifulSoup(urlopen(page_url).read()).findAll("link"):
+                if "application/rss" in link.get(
                     "type", ""
-                ) or "application/atom" in l.get("type", ""):
-                    rss_url = urljoin(page_url, l["href"])
+                ) or "application/atom" in link.get("type", ""):
+                    rss_url = urljoin(page_url, link["href"])
                     break
             else:
                 raise CommandError("Could not parse RSS link from the page")

diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py
@@ -288,7 +288,7 @@ def __delattr__(self, item):
     else:
         try:
             import_module("%s.defaults" % app)
-        except:
+        except:  # noqa
             if module_has_submodule(module, "defaults"):
                 raise
 

diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py
@@ -38,7 +38,7 @@ def __init__(self, *args, **kwargs):
                     for code in OrderedDict(settings.LANGUAGES):
                         try:
                             activate(code)
-                        except:
+                        except:  # noqa
                             pass
                         else:
                             self._init_field(
@@ -126,7 +126,7 @@ def save(self):
                 if registry[name]["translatable"]:
                     try:
                         activate(code)
-                    except:
+                    except:  # noqa
                         pass
                     finally:
                         setting_obj.value = value

diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py
@@ -146,7 +146,7 @@ def save_model(self, request, obj, form, change):
                 if code != lang:  # Already done
                     try:
                         activate(code)
-                    except:
+                    except:  # noqa
                         pass
                     else:
                         obj.save()

diff --git a/mezzanine/core/management/commands/runserver.py b/mezzanine/core/management/commands/runserver.py
@@ -165,7 +165,7 @@ def inner_run(self, *args, **kwargs):
             # shouldn't be able to crash the development server.
             try:
                 self.stdout.write(banner())
-            except:
+            except:  # noqa
                 pass
         super(Command, self).inner_run(*args, **kwargs)
 

diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py
@@ -374,7 +374,7 @@ def thumbnail(
     f = default_storage.open(image_url)
     try:
         image = Image.open(f)
-    except:
+    except:  # noqa
         # Invalid image format.
         return image_url
 
@@ -386,7 +386,7 @@ def thumbnail(
     # - http://caniuse.com/#feat=css-image-orientation
     try:
         orientation = image._getexif().get(0x0112)
-    except:
+    except:  # noqa
         orientation = None
     if orientation:
         methods = {
@@ -420,7 +420,7 @@ def thumbnail(
     if image.mode not in ("P", "L", "RGBA") and filetype not in ("JPG", "JPEG"):
         try:
             image = image.convert("RGBA")
-        except:
+        except:  # noqa
             return image_url
     # Required for progressive jpgs.
     ImageFile.MAXBLOCK = 2 * (max(image.size) ** 2)

diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py
@@ -68,7 +68,7 @@ def save(self, delete_zip_import=True, *args, **kwargs):
                     image.verify()
                 except ImportError:
                     pass
-                except:
+                except:  # noqa
                     continue
                 name = os.path.split(name)[1]
 

diff --git a/mezzanine/pages/page_processors.py b/mezzanine/pages/page_processors.py
@@ -72,6 +72,6 @@ def autodiscover():
         else:
             try:
                 import_module("%s.page_processors" % app)
-            except:
+            except:  # noqa
                 if module_has_submodule(module, "page_processors"):
                     raise
diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py
@@ -405,7 +405,7 @@ def python(code, show=True):
         "import django;"
         "django.setup();" % env.proj_app
     )
-    full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`"))
+    full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`"))  # noqa
     with project():
         if show:
             print_command(code)

diff --git a/mezzanine/twitter/management/commands/poll_twitter.py b/mezzanine/twitter/management/commands/poll_twitter.py
@@ -25,5 +25,5 @@ def handle(self, **options):
                 print("Twitter query error [%s]: %s" % (query, e))
         try:
             db.close_connection()
-        except:
+        except:  # noqa
             pass
diff --git a/mezzanine/utils/docs.py b/mezzanine/utils/docs.py
@@ -213,7 +213,7 @@ def build_changelog(docs_path, package_name="mezzanine"):
                 try:
                     tag(ui, repo, version_tag, rev=cs.hex())
                     print("Tagging version %s" % version_tag)
-                except:
+                except:  # noqa
                     pass
 
         # Ignore changesets that are merges, bumped the version, closed

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -3,7 +3,6 @@
 import sys
 
 import django
-import pytest
 
 from pathlib import Path
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -210,7 +210,7 @@ def test_multisite(self):
         # setup
         try:
             old_site_id = settings.SITE_ID
-        except:
+        except:  # noqa
             old_site_id = None
 
         site1 = Site.objects.create(domain="site1.com")
@@ -509,7 +509,7 @@ def test_update_site(self):
         # setup
         try:
             old_site_id = settings.SITE_ID
-        except:
+        except:  # noqa
             old_site_id = None
 
         site1 = Site.objects.create(domain="site1.com")

diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -52,7 +52,7 @@ def test_submit_button_text(self):
         for c in code_list:
             try:
                 activate(c)
-            except:
+            except:  # noqa
                 pass
             else:
                 break

diff --git a/tests/test_pages.py b/tests/test_pages.py
@@ -442,7 +442,7 @@ def test_page_slug_has_correct_lang(self):
         for code in code_list:
             try:
                 activate(code)
-            except:
+            except:  # noqa
                 pass
             else:
                 break
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,7 +288,7 @@ def __delattr__(self, item): @@
         else:
             try:
                 import_module("%s.defaults" % app)
-            except:
+            except:  # noqa
                 if module_has_submodule(module, "defaults"):
                     raise
@@ Expand Down @@