From babe7a70c7e3b4d2f5683f8d0492b90071a6e6d6 Mon Sep 17 00:00:00 2001
From: arthur <arthur@wallstreetweb.net>
Date: Sun, 8 May 2016 01:31:16 +0200
Subject: [PATCH] Optimise imports

---
 djadmin2/actions.py                      |  4 ++--
 djadmin2/admin2.py                       |  3 +--
 djadmin2/apiviews.py                     |  1 -
 djadmin2/filters.py                      | 18 ++++++++----------
 djadmin2/forms.py                        | 11 +++++------
 djadmin2/permissions.py                  |  4 ++--
 djadmin2/renderers.py                    |  2 +-
 djadmin2/types.py                        | 13 ++++++-------
 djadmin2/views.py                        | 10 ++++------
 example/blog/actions.py                  |  4 ++--
 example/blog/migrations/0001_initial.py  |  2 +-
 example/blog/tests/test_apiviews.py      |  7 ++++---
 example/blog/tests/test_filters.py       |  7 +++----
 example/blog/tests/test_modelforms.py    |  3 +--
 example/blog/tests/test_nestedobjects.py |  3 +--
 example/blog/tests/test_permissions.py   |  4 +---
 example/blog/tests/test_views.py         |  1 +
 example/example/urls.py                  |  3 ++-
 example/files/admin2.py                  |  2 --
 example/files/tests/test_models.py       | 10 +++-------
 example/files/tests/test_views.py        |  5 ++---
 example/polls/models.py                  |  2 +-
 example/polls/tests/test_models.py       |  3 +--
 23 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/djadmin2/actions.py b/djadmin2/actions.py
index 6718b81..9638726 100644
--- a/djadmin2/actions.py
+++ b/djadmin2/actions.py
@@ -3,11 +3,11 @@ from __future__ import division, absolute_import, unicode_literals
 
 from django.contrib import messages
 from django.db import router
-from django.views.generic import TemplateView
 from django.utils.encoding import force_text
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy, ungettext, pgettext_lazy
 from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy, ungettext, pgettext_lazy
+from django.views.generic import TemplateView
 
 from . import permissions, utils
 from .viewmixins import Admin2ModelMixin
diff --git a/djadmin2/admin2.py b/djadmin2/admin2.py
index f1089f0..5cfece8 100644
--- a/djadmin2/admin2.py
+++ b/djadmin2/admin2.py
@@ -4,11 +4,10 @@ from __future__ import division, absolute_import, unicode_literals
 from django.conf import settings
 from django.contrib.auth.models import Group, User
 from django.contrib.sites.models import Site
-
 from rest_framework.relations import PrimaryKeyRelatedField
 
-from djadmin2.forms import UserCreationForm, UserChangeForm
 from djadmin2.apiviews import Admin2APISerializer
+from djadmin2.forms import UserCreationForm, UserChangeForm
 from djadmin2.site import djadmin2_site
 from djadmin2.types import ModelAdmin2
 
diff --git a/djadmin2/apiviews.py b/djadmin2/apiviews.py
index de4b424..da2a02c 100644
--- a/djadmin2/apiviews.py
+++ b/djadmin2/apiviews.py
@@ -2,7 +2,6 @@
 from __future__ import division, absolute_import, unicode_literals
 
 from django.utils.encoding import force_str
-
 from rest_framework import fields, generics, serializers
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
diff --git a/djadmin2/filters.py b/djadmin2/filters.py
index a2c894f..557b2f7 100644
--- a/djadmin2/filters.py
+++ b/djadmin2/filters.py
@@ -2,19 +2,17 @@
 from __future__ import division, absolute_import, unicode_literals
 
 import collections
-
 from itertools import chain
 
-from django import forms
-from django.forms.utils import flatatt
-from django.utils.html import format_html
-from django.utils.encoding import force_text
-from django.utils.safestring import mark_safe
-from django.forms import widgets as django_widgets
-from django.utils import six
-from django.utils.translation import ugettext_lazy
-
 import django_filters
+from django import forms
+from django.forms import widgets as django_widgets
+from django.forms.utils import flatatt
+from django.utils import six
+from django.utils.encoding import force_text
+from django.utils.html import format_html
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy
 
 from .utils import type_str
 
diff --git a/djadmin2/forms.py b/djadmin2/forms.py
index c5e5646..528e6d7 100644
--- a/djadmin2/forms.py
+++ b/djadmin2/forms.py
@@ -3,17 +3,16 @@ from __future__ import division, absolute_import, unicode_literals
 
 from copy import deepcopy
 
+import django
+import django.forms
+import django.forms.extras.widgets
+import django.forms.models
+import floppyforms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
-import django
-import django.forms
-import django.forms.models
-import django.forms.extras.widgets
 from django.utils.translation import ugettext_lazy
 
-import floppyforms
-
 
 _WIDGET_COMMON_ATTRIBUTES = (
     'is_hidden',
diff --git a/djadmin2/permissions.py b/djadmin2/permissions.py
index 5384cc7..359aab4 100644
--- a/djadmin2/permissions.py
+++ b/djadmin2/permissions.py
@@ -20,13 +20,13 @@ from __future__ import division, absolute_import, unicode_literals
 import logging
 import re
 
+from django.apps import apps
 from django.contrib.auth import models as auth_models
 from django.contrib.contenttypes import models as contenttypes_models
-from django.apps import apps
 from django.utils import six
+from django.utils.encoding import python_2_unicode_compatible, force_text
 
 from . import utils
-from django.utils.encoding import python_2_unicode_compatible, force_text
 
 
 logger = logging.getLogger('djadmin2')
diff --git a/djadmin2/renderers.py b/djadmin2/renderers.py
index fbfc9b6..614528f 100644
--- a/djadmin2/renderers.py
+++ b/djadmin2/renderers.py
@@ -9,9 +9,9 @@ import os.path
 from datetime import date, time, datetime
 
 from django.db import models
+from django.template.loader import render_to_string
 from django.utils import formats, timezone
 from django.utils.encoding import force_text
-from django.template.loader import render_to_string
 
 from djadmin2 import settings
 
diff --git a/djadmin2/types.py b/djadmin2/types.py
index 181976b..14976c8 100644
--- a/djadmin2/types.py
+++ b/djadmin2/types.py
@@ -1,22 +1,21 @@
 # -*- coding: utf-8 -*-
 from __future__ import division, absolute_import, unicode_literals
 
-from collections import namedtuple
 import logging
 import os
 import sys
-
-from django.core.urlresolvers import reverse
-from django.conf.urls import patterns, url
-from django.utils.six import with_metaclass
+from collections import namedtuple
 
 import extra_views
+from django.conf.urls import patterns, url
+from django.core.urlresolvers import reverse
+from django.utils.six import with_metaclass
 
+from . import actions
 from . import apiviews
 from . import settings
-from . import views
-from . import actions
 from . import utils
+from . import views
 from .forms import modelform_factory
 
 
diff --git a/djadmin2/views.py b/djadmin2/views.py
index 7bc3292..bd6eb4a 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -2,10 +2,10 @@
 from __future__ import division, absolute_import, unicode_literals
 
 import operator
+from datetime import datetime
 from functools import reduce
 
-from datetime import datetime
-
+import extra_views
 from django.conf import settings
 from django.contrib.auth.forms import (PasswordChangeForm,
                                        AdminPasswordChangeForm)
@@ -21,14 +21,12 @@ from django.utils.encoding import force_text
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy
 from django.views import generic
-import extra_views
-
 
 from . import permissions, utils
-from .forms import AdminAuthenticationForm
-from .viewmixins import Admin2Mixin, Admin2ModelMixin, Admin2ModelFormMixin
 from .filters import build_list_filter, build_date_filter
+from .forms import AdminAuthenticationForm
 from .models import LogEntry
+from .viewmixins import Admin2Mixin, Admin2ModelMixin, Admin2ModelFormMixin
 
 
 class AdminView(object):
diff --git a/example/blog/actions.py b/example/blog/actions.py
index f090e1a..fcb6e5d 100644
--- a/example/blog/actions.py
+++ b/example/blog/actions.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import division, absolute_import, unicode_literals
 
-from django.utils.translation import ugettext_lazy, pgettext_lazy
 from django.contrib import messages
+from django.utils.translation import ugettext_lazy, pgettext_lazy
 
-from djadmin2.actions import BaseListAction
 from djadmin2 import permissions
+from djadmin2.actions import BaseListAction
 
 
 
diff --git a/example/blog/migrations/0001_initial.py b/example/blog/migrations/0001_initial.py
index 6c0aa59..73b42b7 100644
--- a/example/blog/migrations/0001_initial.py
+++ b/example/blog/migrations/0001_initial.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/example/blog/tests/test_apiviews.py b/example/blog/tests/test_apiviews.py
index aca0e8d..6504eaa 100644
--- a/example/blog/tests/test_apiviews.py
+++ b/example/blog/tests/test_apiviews.py
@@ -1,16 +1,17 @@
 from __future__ import unicode_literals
+
+import json
+
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils.encoding import force_text
-import json
-
 
+from djadmin2 import ModelAdmin2
 from djadmin2 import apiviews
 from djadmin2 import default
-from djadmin2 import ModelAdmin2
 from ..models import Post
 
 
diff --git a/example/blog/tests/test_filters.py b/example/blog/tests/test_filters.py
index 660ecc8..c189f08 100644
--- a/example/blog/tests/test_filters.py
+++ b/example/blog/tests/test_filters.py
@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
 # vim:fenc=utf-8
 
+import django_filters
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.core.urlresolvers import reverse
 
+import djadmin2.filters as djadmin2_filters
 from djadmin2.types import ModelAdmin2
 from ..models import Post
 
-import djadmin2.filters as djadmin2_filters
-
-import django_filters
 
 class ListFilterBuilderTest(TestCase):
 
diff --git a/example/blog/tests/test_modelforms.py b/example/blog/tests/test_modelforms.py
index 7d63b11..c7c8e42 100644
--- a/example/blog/tests/test_modelforms.py
+++ b/example/blog/tests/test_modelforms.py
@@ -1,10 +1,9 @@
 from __future__ import unicode_literals
 
+import floppyforms
 from django import forms
 from django.test import TestCase
 
-import floppyforms
-
 from djadmin2.forms import floppify_widget, floppify_form, modelform_factory
 from ..models import Post
 
diff --git a/example/blog/tests/test_nestedobjects.py b/example/blog/tests/test_nestedobjects.py
index 46e4ff1..49ab64f 100644
--- a/example/blog/tests/test_nestedobjects.py
+++ b/example/blog/tests/test_nestedobjects.py
@@ -2,8 +2,7 @@ from django.db import DEFAULT_DB_ALIAS, router
 from django.test import TestCase
 
 from djadmin2.utils import NestedObjects
-
-from ..models import Count, Event, EventGuide, Guest, Location
+from ..models import Count, Event, EventGuide
 
 
 class NestedObjectsTests(TestCase):
diff --git a/example/blog/tests/test_permissions.py b/example/blog/tests/test_permissions.py
index 242a00d..d92c1a2 100644
--- a/example/blog/tests/test_permissions.py
+++ b/example/blog/tests/test_permissions.py
@@ -1,3 +1,4 @@
+from blog.models import Post
 from django.contrib.auth.models import User, Permission
 from django.core.urlresolvers import reverse
 from django.template import Template, Context
@@ -5,9 +6,6 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 
 from djadmin2.permissions import TemplatePermissionChecker
-
-from blog.models import Post
-
 from djadmin2.site import djadmin2_site
 from djadmin2.types import ModelAdmin2
 
diff --git a/example/blog/tests/test_views.py b/example/blog/tests/test_views.py
index 3301908..539884f 100644
--- a/example/blog/tests/test_views.py
+++ b/example/blog/tests/test_views.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from datetime import datetime
 
 from django.contrib.auth import get_user_model
diff --git a/example/example/urls.py b/example/example/urls.py
index ee17edd..fe6d458 100644
--- a/example/example/urls.py
+++ b/example/example/urls.py
@@ -1,7 +1,8 @@
+from blog.views import BlogListView, BlogDetailView
 from django.conf.urls import include, url
 from django.contrib import admin
+
 from djadmin2.site import djadmin2_site
-from blog.views import BlogListView, BlogDetailView
 
 admin.autodiscover()
 djadmin2_site.autodiscover()
diff --git a/example/files/admin2.py b/example/files/admin2.py
index c3dfe6e..1a029e9 100644
--- a/example/files/admin2.py
+++ b/example/files/admin2.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import division, absolute_import, unicode_literals
 
-import djadmin2
 from djadmin2.site import djadmin2_site
-
 from .models import CaptionedFile, UncaptionedFile
 
 
diff --git a/example/files/tests/test_models.py b/example/files/tests/test_models.py
index 4ccc0c5..8fb34dd 100644
--- a/example/files/tests/test_models.py
+++ b/example/files/tests/test_models.py
@@ -1,12 +1,8 @@
-from django.test import TestCase
-from django.utils import timezone
-
-from files.models import CaptionedFile
-from files.models import UncaptionedFile
-
-
 from os import path
 
+from django.test import TestCase
+from files.models import CaptionedFile
+
 
 fixture_dir = path.join(path.abspath(path.dirname(__file__)), 'fixtures')
 
diff --git a/example/files/tests/test_views.py b/example/files/tests/test_views.py
index d36a456..6751c6a 100644
--- a/example/files/tests/test_views.py
+++ b/example/files/tests/test_views.py
@@ -1,13 +1,12 @@
+from os import path
+
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.test import TestCase, Client
-from django.utils import timezone
 from django.utils.encoding import force_text
 
 from ..models import CaptionedFile
 
-from os import path
-
 fixture_dir = path.join(path.abspath(path.dirname(__file__)), 'fixtures')
 fixture_file = path.join(fixture_dir, 'pubtest.txt')
 
diff --git a/example/polls/models.py b/example/polls/models.py
index 44cc4c2..422849e 100644
--- a/example/polls/models.py
+++ b/example/polls/models.py
@@ -3,9 +3,9 @@ from __future__ import division, absolute_import, unicode_literals
 
 import datetime
 
-from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 
diff --git a/example/polls/tests/test_models.py b/example/polls/tests/test_models.py
index e0487d6..a33fcf2 100644
--- a/example/polls/tests/test_models.py
+++ b/example/polls/tests/test_models.py
@@ -1,8 +1,7 @@
 from django.test import TestCase
 from django.utils import timezone
-
-from polls.models import Poll
 from polls.models import Choice
+from polls.models import Poll
 
 
 class PollTestCase(TestCase):