Re-order the codebase's imports with the 'cryptography' style

zinnia/admin/__init__.py

@@ -1,10 +1,10 @@
 """Admin of Zinnia"""
 from django.contrib import admin
 
-from zinnia.models.entry import Entry
-from zinnia.models.category import Category
-from zinnia.admin.entry import EntryAdmin
 from zinnia.admin.category import CategoryAdmin
+from zinnia.admin.entry import EntryAdmin
+from zinnia.models.category import Category
+from zinnia.models.entry import Entry
 from zinnia.settings import ENTRY_BASE_MODEL
 
 

zinnia/admin/category.py

@@ -1,7 +1,7 @@
 """CategoryAdmin for Zinnia"""
 from django.contrib import admin
-from django.utils.html import format_html
 from django.core.urlresolvers import NoReverseMatch
+from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
 from zinnia.admin.forms import CategoryAdminForm

zinnia/admin/entry.py

@@ -2,26 +2,26 @@
 from __future__ import unicode_literals
 
 from django.contrib import admin
-from django.db.models import Q
-from django.utils import timezone
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.core.urlresolvers import NoReverseMatch
+from django.core.urlresolvers import reverse
+from django.db.models import Q
+from django.utils import timezone
+from django.utils.html import conditional_escape
 from django.utils.html import format_html
 from django.utils.html import format_html_join
-from django.utils.html import conditional_escape
-from django.utils.translation import ungettext_lazy
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from zinnia import settings
+from zinnia.admin.filters import AuthorListFilter
+from zinnia.admin.filters import CategoryListFilter
+from zinnia.admin.forms import EntryAdminForm
+from zinnia.comparison import EntryPublishedVectorBuilder
 from zinnia.managers import HIDDEN
 from zinnia.managers import PUBLISHED
 from zinnia.models.author import Author
 from zinnia.ping import DirectoryPinger
-from zinnia.admin.forms import EntryAdminForm
-from zinnia.admin.filters import AuthorListFilter
-from zinnia.admin.filters import CategoryListFilter
-from zinnia.comparison import EntryPublishedVectorBuilder
 
 
 class EntryAdmin(admin.ModelAdmin):

zinnia/admin/filters.py

@@ -1,9 +1,9 @@
 """Filters for Zinnia admin"""
+from django.contrib.admin import SimpleListFilter
 from django.db.models import Count
 from django.utils.encoding import smart_text
-from django.contrib.admin import SimpleListFilter
-from django.utils.translation import ungettext_lazy
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from zinnia.models.author import Author
 from zinnia.models.category import Category

zinnia/admin/forms.py

@@ -1,16 +1,16 @@
 """Forms for Zinnia admin"""
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
+from django.utils.translation import ugettext_lazy as _
 
 from mptt.forms import TreeNodeChoiceField
 
-from zinnia.models.entry import Entry
-from zinnia.models.category import Category
+from zinnia.admin.fields import MPTTModelMultipleChoiceField
+from zinnia.admin.widgets import MPTTFilteredSelectMultiple
 from zinnia.admin.widgets import MiniTextarea
 from zinnia.admin.widgets import TagAutoComplete
-from zinnia.admin.widgets import MPTTFilteredSelectMultiple
-from zinnia.admin.fields import MPTTModelMultipleChoiceField
+from zinnia.models.category import Category
+from zinnia.models.entry import Entry
 
 
 class CategoryAdminForm(forms.ModelForm):

zinnia/admin/widgets.py

@@ -1,14 +1,14 @@
 """Widgets for Zinnia admin"""
 import json
 
-from django.utils import six
+from django.contrib.admin import widgets
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.forms import Media
+from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.html import escape
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils.encoding import force_text
-from django.contrib.admin import widgets
-from django.contrib.staticfiles.storage import staticfiles_storage
 
 from tagging.models import Tag
 

zinnia/breadcrumbs.py

@@ -1,12 +1,12 @@
 """Breadcrumb module for Zinnia"""
 import re
-from functools import wraps
 from datetime import datetime
+from functools import wraps
 
+from django.core.urlresolvers import reverse
 from django.utils.dateformat import format
 from django.utils.timezone import is_aware
 from django.utils.timezone import localtime
-from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 
 

zinnia/calendar.py

@@ -1,14 +1,14 @@
 """Calendar module for Zinnia"""
 from __future__ import absolute_import
 
-from datetime import date
 from calendar import HTMLCalendar
+from datetime import date
 
+from django.core.urlresolvers import reverse
 from django.utils.dates import MONTHS
 from django.utils.dates import WEEKDAYS_ABBR
-from django.utils.formats import get_format
 from django.utils.formats import date_format
-from django.core.urlresolvers import reverse
+from django.utils.formats import get_format
 
 from zinnia.models.entry import Entry
 

zinnia/comparison.py

@@ -1,18 +1,18 @@
 """Comparison tools for Zinnia"""
 from math import sqrt
 
-from django.utils import six
-from django.core.cache import caches
-from django.utils.html import strip_tags
 from django.contrib.sites.models import Site
-from django.utils.functional import cached_property
 from django.core.cache import InvalidCacheBackendError
+from django.core.cache import caches
+from django.utils import six
+from django.utils.functional import cached_property
+from django.utils.html import strip_tags
 
 import regex as re
 
 from zinnia.models.entry import Entry
-from zinnia.settings import STOP_WORDS
 from zinnia.settings import COMPARISON_FIELDS
+from zinnia.settings import STOP_WORDS
 
 
 PUNCTUATION = re.compile(r'\p{P}+')

zinnia/feeds.py

@@ -6,33 +6,33 @@
 except ImportError:  # Python 2
     from urlparse import urljoin
 
-from django.utils.encoding import smart_text
+from bs4 import BeautifulSoup
+
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
+from django.contrib.syndication.views import Feed
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import NoReverseMatch
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
+from django.template.defaultfilters import slugify
+from django.utils.encoding import smart_text
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.translation import ugettext as _
-from django.contrib.syndication.views import Feed
-from django.template.defaultfilters import slugify
-from django.core.urlresolvers import NoReverseMatch
-from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.contenttypes.models import ContentType
-
-from bs4 import BeautifulSoup
 
 import django_comments as comments
 
 from tagging.models import Tag
 from tagging.models import TaggedItem
 
-from zinnia.models.entry import Entry
 from zinnia.models.author import Author
-from zinnia.settings import PROTOCOL
+from zinnia.models.entry import Entry
 from zinnia.settings import COPYRIGHT
 from zinnia.settings import FEEDS_FORMAT
 from zinnia.settings import FEEDS_MAX_ITEMS
-from zinnia.views.categories import get_category_or_404
+from zinnia.settings import PROTOCOL
 from zinnia.templatetags.zinnia import get_gravatar
+from zinnia.views.categories import get_category_or_404
 
 
 class ZinniaFeed(Feed):

zinnia/flags.py

@@ -1,6 +1,6 @@
 """Comment flags for Zinnia"""
-from django.utils.lru_cache import lru_cache
 from django.contrib.auth import get_user_model
+from django.utils.lru_cache import lru_cache
 
 from zinnia.settings import COMMENT_FLAG_USER_ID
 

zinnia/management/commands/count_discussions.py

@@ -3,8 +3,8 @@
 """
 import sys
 
-from django.utils.encoding import smart_str
 from django.core.management.base import BaseCommand
+from django.utils.encoding import smart_str
 
 from zinnia.models.entry import Entry
 from zinnia.signals import disconnect_entry_signals

zinnia/management/commands/spam_cleanup.py

@@ -1,8 +1,8 @@
 """
 Spam cleanup command module for Zinnia.
 """
-from django.core.management.base import BaseCommand
 from django.contrib.contenttypes.models import ContentType
+from django.core.management.base import BaseCommand
 
 import django_comments as comments
 

zinnia/managers.py

@@ -1,7 +1,7 @@
 """Managers of Zinnia"""
+from django.contrib.sites.models import Site
 from django.db import models
 from django.utils import timezone
-from django.contrib.sites.models import Site
 
 from zinnia.settings import SEARCH_FIELDS
 

zinnia/markups.py

@@ -4,12 +4,12 @@
 """
 import warnings
 
-from django.utils.html import linebreaks
-from django.utils.encoding import force_text
 from django.utils.encoding import force_bytes
+from django.utils.encoding import force_text
+from django.utils.html import linebreaks
 
-from zinnia.settings import MARKUP_LANGUAGE
 from zinnia.settings import MARKDOWN_EXTENSIONS
+from zinnia.settings import MARKUP_LANGUAGE
 from zinnia.settings import RESTRUCTUREDTEXT_SETTINGS
 
 

zinnia/migrations/0001_initial.py

@@ -1,13 +1,13 @@
-from django.db import models
-from django.db import migrations
-from django.conf import settings
 import django.utils.timezone
+from django.conf import settings
+from django.db import migrations
+from django.db import models
 
 import mptt.fields
 import tagging.fields
 
-import zinnia.settings
 import zinnia.models_bases.entry
+import zinnia.settings
 
 
 class Migration(migrations.Migration):

zinnia/migrations/0002_lead_paragraph_and_image_caption.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

zinnia/migrations/0003_publication_date.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.db import migrations
+from django.db import models
 from django.utils import timezone
 
 

zinnia/migrations/0004_on_delete_arg.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.db import migrations
+from django.db import models
 import mptt.fields
 
 

zinnia/models/__init__.py

@@ -1,7 +1,7 @@
 """Models for Zinnia"""
-from zinnia.models.entry import Entry
 from zinnia.models.author import Author
 from zinnia.models.category import Category
+from zinnia.models.entry import Entry
 
 # Here we import the Zinnia's Model classes
 # to register the Models at the loading, not

zinnia/models/author.py

@@ -1,11 +1,11 @@
 """Author model for Zinnia"""
 from django.apps import apps
-from django.db import models
 from django.conf import settings
+from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
-from zinnia.managers import entries_published
 from zinnia.managers import EntryRelatedPublishedManager
+from zinnia.managers import entries_published
 
 
 def safe_get_user_model():

zinnia/models/category.py

@@ -1,14 +1,14 @@
 """Category model for Zinnia"""
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import python_2_unicode_compatible
+from django.utils.translation import ugettext_lazy as _
 
+from mptt.managers import TreeManager
 from mptt.models import MPTTModel
 from mptt.models import TreeForeignKey
-from mptt.managers import TreeManager
 
-from zinnia.managers import entries_published
 from zinnia.managers import EntryRelatedPublishedManager
+from zinnia.managers import entries_published
 
 
 @python_2_unicode_compatible

zinnia/models/entry.py

@@ -1,6 +1,6 @@
 """Entry model for Zinnia"""
-from zinnia.settings import ENTRY_BASE_MODEL
 from zinnia.models_bases import load_model_class
+from zinnia.settings import ENTRY_BASE_MODEL
 
 
 class Entry(load_model_class(ENTRY_BASE_MODEL)):

zinnia/models_bases/entry.py

@@ -1,15 +1,15 @@
 """Base entry models for Zinnia"""
 import os
 
+from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models import Q
+from django.template.defaultfilters import slugify
 from django.utils import timezone
-from django.utils.text import Truncator
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import strip_tags
-from django.contrib.sites.models import Site
-from django.template.defaultfilters import slugify
+from django.utils.text import Truncator
 from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import python_2_unicode_compatible
 
 import django_comments as comments
 from django_comments.models import CommentFlag
@@ -19,17 +19,17 @@
 
 from zinnia.flags import PINGBACK
 from zinnia.flags import TRACKBACK
+from zinnia.managers import DRAFT, HIDDEN, PUBLISHED
+from zinnia.managers import EntryPublishedManager
+from zinnia.managers import entries_published
 from zinnia.markups import html_format
 from zinnia.preview import HTMLPreview
-from zinnia.settings import UPLOAD_TO
-from zinnia.settings import ENTRY_DETAIL_TEMPLATES
-from zinnia.settings import ENTRY_CONTENT_TEMPLATES
 from zinnia.settings import AUTO_CLOSE_COMMENTS_AFTER
 from zinnia.settings import AUTO_CLOSE_PINGBACKS_AFTER
 from zinnia.settings import AUTO_CLOSE_TRACKBACKS_AFTER
-from zinnia.managers import entries_published
-from zinnia.managers import EntryPublishedManager
-from zinnia.managers import DRAFT, HIDDEN, PUBLISHED
+from zinnia.settings import ENTRY_CONTENT_TEMPLATES
+from zinnia.settings import ENTRY_DETAIL_TEMPLATES
+from zinnia.settings import UPLOAD_TO
 from zinnia.url_shortener import get_url_shortener