summaryrefslogtreecommitdiff
path: root/django/core/cache
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-07 12:11:46 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 21:33:28 +0100
commit2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch)
treed3e73cf44b15139aa9f1f53e398942ba64f5e190 /django/core/cache
parent7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff)
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'django/core/cache')
-rw-r--r--django/core/cache/backends/db.py6
-rw-r--r--django/core/cache/backends/filebased.py6
-rw-r--r--django/core/cache/backends/locmem.py7
3 files changed, 3 insertions, 16 deletions
diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py
index ad805324bd..97f307e24d 100644
--- a/django/core/cache/backends/db.py
+++ b/django/core/cache/backends/db.py
@@ -1,5 +1,6 @@
"Database cache backend."
import base64
+import pickle
from datetime import datetime
from django.conf import settings
@@ -8,11 +9,6 @@ from django.db import DatabaseError, connections, models, router, transaction
from django.utils import timezone
from django.utils.encoding import force_bytes
-try:
- from django.utils.six.moves import cPickle as pickle
-except ImportError:
- import pickle
-
class Options(object):
"""A class that will quack like a Django model _meta class.
diff --git a/django/core/cache/backends/filebased.py b/django/core/cache/backends/filebased.py
index 7c2c5c7edb..88509ed8de 100644
--- a/django/core/cache/backends/filebased.py
+++ b/django/core/cache/backends/filebased.py
@@ -4,6 +4,7 @@ import glob
import hashlib
import io
import os
+import pickle
import random
import tempfile
import time
@@ -13,11 +14,6 @@ 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:
- import pickle
-
class FileBasedCache(BaseCache):
cache_suffix = '.djcache'
diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py
index 8916ad176c..cf86dcaa0c 100644
--- a/django/core/cache/backends/locmem.py
+++ b/django/core/cache/backends/locmem.py
@@ -1,17 +1,12 @@
"Thread-safe in-memory cache backend."
+import pickle
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
-
-
# Global in-memory store of cache data. Keyed by name, to provide
# multiple named local memory caches.
_caches = {}