11 files changed, 33 insertions, 33 deletions
diff --git a/django/contrib/staticfiles/apps.py b/django/contrib/staticfiles/apps.py
index ae69667b7b..f406e16181 100644
--- a/django/contrib/staticfiles/apps.py
+++ b/django/contrib/staticfiles/apps.py
@@ -1,5 +1,4 @@
 from django.apps import AppConfig
-
 from django.utils.translation import ugettext_lazy as _
 
 
diff --git a/django/contrib/staticfiles/finders.py b/django/contrib/staticfiles/finders.py
index 3569f360b2..7c775e7f89 100644
--- a/django/contrib/staticfiles/finders.py
+++ b/django/contrib/staticfiles/finders.py
@@ -1,16 +1,17 @@
-from collections import OrderedDict
 import os
+from collections import OrderedDict
 
 from django.apps import apps
 from django.conf import settings
+from django.contrib.staticfiles import utils
 from django.core.exceptions import ImproperlyConfigured
-from django.core.files.storage import default_storage, Storage, FileSystemStorage
-from django.utils.functional import empty, LazyObject
-from django.utils.module_loading import import_string
+from django.core.files.storage import (
+    FileSystemStorage, Storage, default_storage,
+)
+from django.utils import lru_cache, six
 from django.utils._os import safe_join
-from django.utils import six, lru_cache
-
-from django.contrib.staticfiles import utils
+from django.utils.functional import LazyObject, empty
+from django.utils.module_loading import import_string
 
 # To keep track on which directories the finder has searched the static files.
 searched_locations = []
diff --git a/django/contrib/staticfiles/handlers.py b/django/contrib/staticfiles/handlers.py
index e711f9a476..8dedd60ce8 100644
--- a/django/contrib/staticfiles/handlers.py
+++ b/django/contrib/staticfiles/handlers.py
@@ -1,10 +1,9 @@
 from django.conf import settings
-from django.core.handlers.wsgi import get_path_info, WSGIHandler
-from django.utils.six.moves.urllib.parse import urlparse
-from django.utils.six.moves.urllib.request import url2pathname
-
 from django.contrib.staticfiles import utils
 from django.contrib.staticfiles.views import serve
+from django.core.handlers.wsgi import WSGIHandler, get_path_info
+from django.utils.six.moves.urllib.parse import urlparse
+from django.utils.six.moves.urllib.request import url2pathname
 
 
 class StaticFilesHandler(WSGIHandler):
diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py
index 10c8c8f8d9..1ed7127f96 100644
--- a/django/contrib/staticfiles/management/commands/collectstatic.py
+++ b/django/contrib/staticfiles/management/commands/collectstatic.py
@@ -3,15 +3,14 @@ from __future__ import unicode_literals
 import os
 from collections import OrderedDict
 
+from django.contrib.staticfiles.finders import get_finders
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.files.storage import FileSystemStorage
-from django.core.management.base import CommandError, BaseCommand
+from django.core.management.base import BaseCommand, CommandError
 from django.core.management.color import no_style
 from django.utils.encoding import smart_text
 from django.utils.six.moves import input
 
-from django.contrib.staticfiles.finders import get_finders
-from django.contrib.staticfiles.storage import staticfiles_storage
-
 
 class Command(BaseCommand):
     """
diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py
index 658ac3f248..2152035dbb 100644
--- a/django/contrib/staticfiles/management/commands/findstatic.py
+++ b/django/contrib/staticfiles/management/commands/findstatic.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
 import os
-from django.core.management.base import LabelCommand
-from django.utils.encoding import force_text
 
 from django.contrib.staticfiles import finders
+from django.core.management.base import LabelCommand
+from django.utils.encoding import force_text
 
 
 class Command(LabelCommand):
diff --git a/django/contrib/staticfiles/management/commands/runserver.py b/django/contrib/staticfiles/management/commands/runserver.py
index fd358bee3d..d42c773457 100644
--- a/django/contrib/staticfiles/management/commands/runserver.py
+++ b/django/contrib/staticfiles/management/commands/runserver.py
@@ -1,7 +1,7 @@
 from django.conf import settings
-from django.core.management.commands.runserver import Command as RunserverCommand
-
 from django.contrib.staticfiles.handlers import StaticFilesHandler
+from django.core.management.commands.runserver import \
+    Command as RunserverCommand
 
 
 class Command(RunserverCommand):
diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py
index 9046bb1d51..6a0a5407dd 100644
--- a/django/contrib/staticfiles/storage.py
+++ b/django/contrib/staticfiles/storage.py
@@ -1,22 +1,25 @@
 from __future__ import unicode_literals
-from collections import OrderedDict
+
 import hashlib
+import json
 import os
 import posixpath
 import re
-import json
+from collections import OrderedDict
 
 from django.conf import settings
-from django.core.cache import (caches, InvalidCacheBackendError,
-                               cache as default_cache)
+from django.contrib.staticfiles.utils import check_settings, matches_patterns
+from django.core.cache import (
+    InvalidCacheBackendError, cache as default_cache, caches,
+)
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage, get_storage_class
 from django.utils.encoding import force_bytes, force_text
 from django.utils.functional import LazyObject
-from django.utils.six.moves.urllib.parse import unquote, urlsplit, urlunsplit, urldefrag
-
-from django.contrib.staticfiles.utils import check_settings, matches_patterns
+from django.utils.six.moves.urllib.parse import (
+    unquote, urldefrag, urlsplit, urlunsplit,
+)
 
 
 class StaticFilesStorage(FileSystemStorage):
diff --git a/django/contrib/staticfiles/templatetags/staticfiles.py b/django/contrib/staticfiles/templatetags/staticfiles.py
index b5466cab31..e666e3adba 100644
--- a/django/contrib/staticfiles/templatetags/staticfiles.py
+++ b/django/contrib/staticfiles/templatetags/staticfiles.py
@@ -1,6 +1,6 @@
 from django import template
-from django.templatetags.static import StaticNode
 from django.contrib.staticfiles.storage import staticfiles_storage
+from django.templatetags.static import StaticNode
 
 register = template.Library()
 
diff --git a/django/contrib/staticfiles/testing.py b/django/contrib/staticfiles/testing.py
index 7b30499ece..4eb4adcd04 100644
--- a/django/contrib/staticfiles/testing.py
+++ b/django/contrib/staticfiles/testing.py
@@ -1,6 +1,5 @@
-from django.test import LiveServerTestCase
-
 from django.contrib.staticfiles.handlers import StaticFilesHandler
+from django.test import LiveServerTestCase
 
 
 class StaticLiveServerTestCase(LiveServerTestCase):
diff --git a/django/contrib/staticfiles/utils.py b/django/contrib/staticfiles/utils.py
index 92bca71d57..2c44bb7790 100644
--- a/django/contrib/staticfiles/utils.py
+++ b/django/contrib/staticfiles/utils.py
@@ -1,5 +1,6 @@
-import os
 import fnmatch
+import os
+
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
diff --git a/django/contrib/staticfiles/views.py b/django/contrib/staticfiles/views.py
index 166879a0e5..cec1247e5e 100644
--- a/django/contrib/staticfiles/views.py
+++ b/django/contrib/staticfiles/views.py
@@ -7,12 +7,11 @@ import os
 import posixpath
 
 from django.conf import settings
+from django.contrib.staticfiles import finders
 from django.http import Http404
 from django.utils.six.moves.urllib.parse import unquote
 from django.views import static
 
-from django.contrib.staticfiles import finders
-
 
 def serve(request, path, insecure=False, **kwargs):
     """