summaryrefslogtreecommitdiff
path: root/django/middleware
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-09 13:19:34 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 14:24:06 -0500
commita8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch)
tree94ef5bc53e59131906aecfcf792eeac86242aa62 /django/middleware
parenteb406aa686ff1809903366ef6896037af2f1f69b (diff)
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/middleware')
-rw-r--r--django/middleware/cache.py8
-rw-r--r--django/middleware/common.py7
-rw-r--r--django/middleware/csrf.py3
-rw-r--r--django/middleware/gzip.py2
-rw-r--r--django/middleware/locale.py7
5 files changed, 14 insertions, 13 deletions
diff --git a/django/middleware/cache.py b/django/middleware/cache.py
index 7fab78f3dc..79202adda3 100644
--- a/django/middleware/cache.py
+++ b/django/middleware/cache.py
@@ -44,9 +44,11 @@ More details about how the caching works:
"""
from django.conf import settings
-from django.core.cache import caches, DEFAULT_CACHE_ALIAS
-from django.utils.cache import (get_cache_key, get_max_age, has_vary_header,
- learn_cache_key, patch_response_headers)
+from django.core.cache import DEFAULT_CACHE_ALIAS, caches
+from django.utils.cache import (
+ get_cache_key, get_max_age, has_vary_header, learn_cache_key,
+ patch_response_headers,
+)
class UpdateCacheMiddleware(object):
diff --git a/django/middleware/common.py b/django/middleware/common.py
index 0bf0481df6..0846606d7d 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -2,14 +2,13 @@ import hashlib
import logging
import re
+from django import http
from django.conf import settings
-from django.core.mail import mail_managers
from django.core import urlresolvers
-from django import http
+from django.core.mail import mail_managers
+from django.utils import six
from django.utils.encoding import force_text
from django.utils.http import urlquote
-from django.utils import six
-
logger = logging.getLogger('django.request')
diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py
index 7cbec6c772..f12126fa9f 100644
--- a/django/middleware/csrf.py
+++ b/django/middleware/csrf.py
@@ -12,10 +12,9 @@ import re
from django.conf import settings
from django.core.urlresolvers import get_callable
from django.utils.cache import patch_vary_headers
+from django.utils.crypto import constant_time_compare, get_random_string
from django.utils.encoding import force_text
from django.utils.http import same_origin
-from django.utils.crypto import constant_time_compare, get_random_string
-
logger = logging.getLogger('django.request')
diff --git a/django/middleware/gzip.py b/django/middleware/gzip.py
index 8548c083e3..e772cb326d 100644
--- a/django/middleware/gzip.py
+++ b/django/middleware/gzip.py
@@ -1,7 +1,7 @@
import re
-from django.utils.text import compress_sequence, compress_string
from django.utils.cache import patch_vary_headers
+from django.utils.text import compress_sequence, compress_string
re_accepts_gzip = re.compile(r'\bgzip\b')
diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index 996b2d4c5b..9719150d59 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -1,11 +1,12 @@
"This is the locale selecting middleware that will look at accept headers"
from django.conf import settings
-from django.core.urlresolvers import (is_valid_path, get_resolver, get_script_prefix,
- LocaleRegexURLResolver)
+from django.core.urlresolvers import (
+ LocaleRegexURLResolver, get_resolver, get_script_prefix, is_valid_path,
+)
from django.http import HttpResponseRedirect
-from django.utils.cache import patch_vary_headers
from django.utils import translation
+from django.utils.cache import patch_vary_headers
class LocaleMiddleware(object):