style: run isort

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Install dependencies
         run: pip install tox -U pip
       - name: Lint
-        run: tox -e package -e flake8 -e black
+        run: tox -e package -e lint
 
   # Create a new semantic release
   release:

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile = black

docs/conf.py

@@ -11,11 +11,11 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from datetime import datetime
-import sys
 import os
-import mezzanine
+import sys
+from datetime import datetime
 
+import mezzanine
 
 if "DJANGO_SETTINGS_MODULE" not in os.environ:
     docs_path = os.getcwd()

mezzanine/accounts/admin.py

@@ -1,12 +1,11 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
-from mezzanine.accounts import get_profile_model, ProfileNotConfigured
 
-from mezzanine.core.admin import SitePermissionUserAdmin
+from mezzanine.accounts import ProfileNotConfigured, get_profile_model
 from mezzanine.conf import settings
+from mezzanine.core.admin import SitePermissionUserAdmin
 from mezzanine.utils.email import send_approved_mail, send_verification_mail
 
-
 User = get_user_model()
 
 user_list_display = SitePermissionUserAdmin.list_display

mezzanine/accounts/defaults.py

@@ -9,13 +9,11 @@
 that are only read during startup shouldn't be editable, since changing
 them would require an application reload.
 """
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 from mezzanine.conf import register_setting
 
-
-from django.conf import settings
-
 profile_model_default = getattr(settings, "AUTH_PROFILE_MODULE", None)
 if profile_model_default:
     from warnings import warn

mezzanine/accounts/forms.py

@@ -1,22 +1,22 @@
+from django import forms
 from django.contrib.auth import authenticate, get_user_model
 from django.contrib.auth.tokens import default_token_generator
 from django.db.models import Q
 from django.db.models.manager import Manager
-from django import forms
 from django.utils.http import int_to_base36
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 from mezzanine.accounts import (
+    ProfileNotConfigured,
+    get_profile_for_user,
     get_profile_model,
     get_profile_user_fieldname,
-    get_profile_for_user,
-    ProfileNotConfigured,
 )
 from mezzanine.conf import settings
 from mezzanine.core.forms import Html5Mixin
 from mezzanine.utils.urls import slugify, unique_slug
 
-
 User = get_user_model()
 
 _exclude_fields = tuple(getattr(settings, "ACCOUNTS_PROFILE_FORM_EXCLUDE_FIELDS", ()))

mezzanine/accounts/models.py

@@ -1,9 +1,9 @@
 from django.db import DatabaseError, connection
 from django.db.models.signals import post_save
+
 from mezzanine.accounts import get_profile_for_user
 from mezzanine.conf import settings
 
-
 __all__ = ()
 
 

mezzanine/accounts/templatetags/accounts_tags.py

@@ -3,15 +3,14 @@
 from django.contrib.auth import get_user_model
 
 from mezzanine import template
-from mezzanine.conf import settings
 from mezzanine.accounts import (
+    ProfileNotConfigured,
+    get_profile_for_user,
     get_profile_form,
     get_profile_user_fieldname,
-    get_profile_for_user,
-    ProfileNotConfigured,
 )
 from mezzanine.accounts.forms import LoginForm
-
+from mezzanine.conf import settings
 
 register = template.Library()
 

mezzanine/accounts/urls.py

@@ -3,7 +3,6 @@
 from mezzanine.accounts import views
 from mezzanine.conf import settings
 
-
 ACCOUNT_URL = getattr(settings, "ACCOUNT_URL", "/accounts/")
 SIGNUP_URL = getattr(settings, "SIGNUP_URL", "/%s/signup/" % ACCOUNT_URL.strip("/"))
 SIGNUP_VERIFY_URL = getattr(

mezzanine/accounts/views.py

@@ -1,23 +1,19 @@
-from django.contrib.auth import (
-    login as auth_login,
-    authenticate,
-    logout as auth_logout,
-    get_user_model,
-)
+from django.contrib.auth import authenticate, get_user_model
+from django.contrib.auth import login as auth_login
+from django.contrib.auth import logout as auth_logout
 from django.contrib.auth.decorators import login_required
-from django.contrib.messages import info, error
-from django.urls import NoReverseMatch, get_script_prefix
+from django.contrib.messages import error, info
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.urls import NoReverseMatch, get_script_prefix
 from django.utils.translation import ugettext_lazy as _
 
 from mezzanine.accounts import get_profile_form
 from mezzanine.accounts.forms import LoginForm, PasswordResetForm
 from mezzanine.conf import settings
-from mezzanine.utils.email import send_verification_mail, send_approve_mail
+from mezzanine.utils.email import send_approve_mail, send_verification_mail
 from mezzanine.utils.urls import login_redirect, next_url
 
-
 User = get_user_model()
 
 

mezzanine/bin/management/commands/mezzanine_project.py

@@ -1,6 +1,6 @@
+import os
 from distutils.dir_util import copy_tree
 from importlib import import_module
-import os
 from shutil import move, rmtree
 from tempfile import mkdtemp
 

mezzanine/blog/admin.py

@@ -3,12 +3,12 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
-from mezzanine.blog.models import BlogPost, BlogCategory
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.conf import settings
 from mezzanine.core.admin import (
+    BaseTranslationModelAdmin,
     DisplayableAdmin,
     OwnableAdmin,
-    BaseTranslationModelAdmin,
 )
 from mezzanine.twitter.admin import TweetableAdminMixin
 

mezzanine/blog/defaults.py

@@ -14,7 +14,6 @@
 
 from mezzanine.conf import register_setting
 
-
 register_setting(
     name="BLOG_USE_FEATURED_IMAGE",
     description=_("Enable featured images in blog posts"),

mezzanine/blog/feeds.py

@@ -1,20 +1,19 @@
 from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import Feed, add_domain
-from django.urls import reverse
 from django.shortcuts import get_object_or_404
+from django.urls import reverse
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.html import strip_tags
 
-from mezzanine.blog.models import BlogPost, BlogCategory
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.conf import settings
-from mezzanine.core.templatetags.mezzanine_tags import richtext_filters
 from mezzanine.core.request import current_request
+from mezzanine.core.templatetags.mezzanine_tags import richtext_filters
 from mezzanine.generic.models import Keyword
 from mezzanine.utils.html import absolute_urls
 from mezzanine.utils.sites import current_site_id
 
-
 User = get_user_model()
 
 try:

mezzanine/blog/forms.py

@@ -3,7 +3,6 @@
 from mezzanine.blog.models import BlogPost
 from mezzanine.core.models import CONTENT_STATUS_DRAFT
 
-
 # These fields need to be in the form, hidden, with default values,
 # since it posts to the blog post admin, which includes these fields
 # and will use empty values instead of the model defaults, without

mezzanine/blog/management/base.py

@@ -7,10 +7,9 @@
 from django.utils.encoding import force_text
 from django.utils.html import strip_tags
 
-from mezzanine.blog.models import BlogPost, BlogCategory
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.conf import settings
-from mezzanine.core.models import CONTENT_STATUS_DRAFT
-from mezzanine.core.models import CONTENT_STATUS_PUBLISHED
+from mezzanine.core.models import CONTENT_STATUS_DRAFT, CONTENT_STATUS_PUBLISHED
 from mezzanine.generic.models import Keyword, ThreadedComment
 from mezzanine.pages.models import RichTextPage
 from mezzanine.utils.html import decode_entities

mezzanine/blog/management/commands/import_blogger.py

@@ -1,6 +1,6 @@
+import re
 from datetime import datetime, timedelta
 from time import timezone
-import re
 
 from django.core.management.base import CommandError
 

mezzanine/blog/management/commands/import_posterous.py

@@ -1,6 +1,6 @@
-from datetime import datetime
 import json
 import time
+from datetime import datetime
 
 from django.core.management.base import CommandError
 

mezzanine/blog/management/commands/import_rss.py

@@ -1,8 +1,7 @@
 from datetime import timedelta
 from time import timezone
-
-from urllib.request import urlopen
 from urllib.parse import urljoin
+from urllib.request import urlopen
 
 from django.core.management.base import CommandError
 

mezzanine/blog/management/commands/import_tumblr.py

@@ -1,15 +1,13 @@
 from datetime import datetime
 from json import loads
 from time import sleep
-
 from urllib.request import urlopen
 
 from django.core.management.base import CommandError
 from django.utils.html import strip_tags
 
 from mezzanine.blog.management.base import BaseImporterCommand
 
-
 MAX_POSTS_PER_CALL = 20  # Max number of posts Tumblr API will return per call.
 MAX_RETRIES_PER_CALL = 3  # Max times to retry API call after failing.
 SLEEP_PER_RETRY = 3  # Seconds to pause for between retries.

mezzanine/blog/management/commands/import_wordpress.py

@@ -1,9 +1,9 @@
+import re
 from collections import defaultdict
 from datetime import datetime, timedelta
-import re
 from time import mktime, timezone
-from xml.dom.minidom import parse
 from xml.dom import Node
+from xml.dom.minidom import parse
 
 from django.core.management.base import CommandError
 from django.utils.html import linebreaks

mezzanine/blog/migrations/0001_initial.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from django.db import models, migrations
+from django.conf import settings
+from django.db import migrations, models
+
 import mezzanine.core.fields
 import mezzanine.utils.models
-from django.conf import settings
 
 
 class Migration(migrations.Migration):

mezzanine/blog/migrations/0002_auto_20150527_1555.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

mezzanine/blog/templatetags/blog_tags.py

@@ -4,10 +4,10 @@
 from django.db.models import Count, Q
 from django.utils import timezone
 
+from mezzanine import template
 from mezzanine.blog.forms import BlogPostForm
-from mezzanine.blog.models import BlogPost, BlogCategory
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.generic.models import Keyword
-from mezzanine import template
 
 User = get_user_model()
 

mezzanine/blog/translation.py

@@ -1,10 +1,11 @@
 from modeltranslation.translator import translator
+
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.core.translation import (
-    TranslatedSlugged,
     TranslatedDisplayable,
     TranslatedRichText,
+    TranslatedSlugged,
 )
-from mezzanine.blog.models import BlogCategory, BlogPost
 
 
 class TranslatedBlogPost(TranslatedDisplayable, TranslatedRichText):

mezzanine/blog/urls.py

@@ -3,7 +3,6 @@
 from mezzanine.blog import views
 from mezzanine.conf import settings
 
-
 # Trailing slahes for urlpatterns based on setup.
 _slash = "/" if settings.APPEND_SLASH else ""
 

mezzanine/blog/views.py

@@ -6,8 +6,8 @@
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext_lazy as _
 
-from mezzanine.blog.models import BlogPost, BlogCategory
-from mezzanine.blog.feeds import PostsRSS, PostsAtom
+from mezzanine.blog.feeds import PostsAtom, PostsRSS
+from mezzanine.blog.models import BlogCategory, BlogPost
 from mezzanine.conf import settings
 from mezzanine.generic.models import Keyword
 from mezzanine.utils.views import paginate

mezzanine/boot/lazy_admin.py

@@ -1,12 +1,8 @@
 from django.conf import settings
 from django.conf.urls import include, url
+from django.contrib.admin.sites import AdminSite, AlreadyRegistered, NotRegistered
+from django.contrib.admin.sites import site as default_site
 from django.contrib.auth import get_user_model
-from django.contrib.admin.sites import (
-    AdminSite,
-    site as default_site,
-    NotRegistered,
-    AlreadyRegistered,
-)
 from django.shortcuts import redirect
 
 from mezzanine.utils.importing import import_dotted_path

mezzanine/conf/__init__.py

@@ -4,11 +4,10 @@
 or Django itself. Settings can also be made editable via the admin.
 """
 
-from weakref import WeakKeyDictionary
-
 from functools import partial
 from importlib import import_module
 from warnings import warn
+from weakref import WeakKeyDictionary
 
 from django.conf import settings as django_settings
 from django.utils.functional import Promise

mezzanine/conf/admin.py

@@ -3,13 +3,13 @@
 from django.contrib import admin
 from django.contrib.messages import info
 from django.http import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_text
+from django.utils.translation import ugettext_lazy as _
 
-from mezzanine.core.admin import BaseTranslationModelAdmin
 from mezzanine.conf import settings
-from mezzanine.conf.models import Setting
 from mezzanine.conf.forms import SettingsForm
+from mezzanine.conf.models import Setting
+from mezzanine.core.admin import BaseTranslationModelAdmin
 from mezzanine.utils.static import static_lazy as static
 from mezzanine.utils.urls import admin_url
 

mezzanine/conf/context_processors.py

@@ -1,6 +1,5 @@
 from warnings import warn
 
-
 # Deprecated settings and their defaults.
 DEPRECATED = {}