diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-09 13:19:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-09 14:24:06 -0500 |
| commit | a8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch) | |
| tree | 94ef5bc53e59131906aecfcf792eeac86242aa62 /django/core/cache | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/core/cache')
| -rw-r--r-- | django/core/cache/backends/base.py | 2 | ||||
| -rw-r--r-- | django/core/cache/backends/db.py | 14 | ||||
| -rw-r--r-- | django/core/cache/backends/dummy.py | 2 | ||||
| -rw-r--r-- | django/core/cache/backends/filebased.py | 4 | ||||
| -rw-r--r-- | django/core/cache/backends/locmem.py | 9 | ||||
| -rw-r--r-- | django/core/cache/backends/memcached.py | 8 | ||||
| -rw-r--r-- | django/core/cache/utils.py | 1 |
7 files changed, 23 insertions, 17 deletions
diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py index 4b7806fc29..7ac1e5bc32 100644 --- a/django/core/cache/backends/base.py +++ b/django/core/cache/backends/base.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import time import warnings -from django.core.exceptions import ImproperlyConfigured, DjangoRuntimeWarning +from django.core.exceptions import DjangoRuntimeWarning, ImproperlyConfigured from django.utils.module_loading import import_string diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py index 99ce96d49e..f016179491 100644 --- a/django/core/cache/backends/db.py +++ b/django/core/cache/backends/db.py @@ -2,18 +2,18 @@ import base64 from datetime import datetime +from django.conf import settings +from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache +from django.db import DatabaseError, connections, router, transaction +from django.db.backends.utils import typecast_timestamp +from django.utils import six, timezone +from django.utils.encoding import force_bytes + try: from django.utils.six.moves import cPickle as pickle except ImportError: import pickle -from django.conf import settings -from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT -from django.db import connections, transaction, router, DatabaseError -from django.db.backends.utils import typecast_timestamp -from django.utils import timezone, six -from django.utils.encoding import force_bytes - class Options(object): """A class that will quack like a Django model _meta class. diff --git a/django/core/cache/backends/dummy.py b/django/core/cache/backends/dummy.py index eb21feebdf..d1aea0a325 100644 --- a/django/core/cache/backends/dummy.py +++ b/django/core/cache/backends/dummy.py @@ -1,6 +1,6 @@ "Dummy cache backend" -from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT +from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache class DummyCache(BaseCache): diff --git a/django/core/cache/backends/filebased.py b/django/core/cache/backends/filebased.py index 94fdfa9ed7..c35efce92c 100644 --- a/django/core/cache/backends/filebased.py +++ b/django/core/cache/backends/filebased.py @@ -8,9 +8,11 @@ import random import tempfile import time import zlib -from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT + +from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache from django.core.files.move import file_move_safe from django.utils.encoding import force_bytes + try: from django.utils.six.moves import cPickle as pickle except ImportError: diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index edf0ff22a7..8916ad176c 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -1,15 +1,16 @@ "Thread-safe in-memory cache backend." -from contextlib import contextmanager import time +from contextlib import contextmanager + +from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache +from django.utils.synch import RWLock + try: from django.utils.six.moves import cPickle as pickle except ImportError: import pickle -from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT -from django.utils.synch import RWLock - # Global in-memory store of cache data. Keyed by name, to provide # multiple named local memory caches. diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py index 87f05f973b..a2af9045dc 100644 --- a/django/core/cache/backends/memcached.py +++ b/django/core/cache/backends/memcached.py @@ -1,11 +1,13 @@ "Memcached cache backend" -import time import pickle +import time -from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT +from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache from django.utils import six -from django.utils.deprecation import RenameMethodsBase, RemovedInDjango19Warning +from django.utils.deprecation import ( + RemovedInDjango19Warning, RenameMethodsBase, +) from django.utils.encoding import force_str from django.utils.functional import cached_property diff --git a/django/core/cache/utils.py b/django/core/cache/utils.py index dd9ad4abd1..c40e4eba0c 100644 --- a/django/core/cache/utils.py +++ b/django/core/cache/utils.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import hashlib + from django.utils.encoding import force_bytes from django.utils.http import urlquote |
