summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-17 19:32:54 -0500
committerTim Graham <timograham@gmail.com>2015-01-17 19:32:54 -0500
commit40d6b376d4ac29c1f271bb827cd9ca24860ce4b5 (patch)
treea0440112b5525810e9e47bdd50882c20383e4f08
parent20e4e8fc79af9a87fb48951d03d3747f1f550551 (diff)
Removed BaseMemcachedCacheMethods._get_memcache_timeout backwards compatibility shim.
Per deprecation timeline; refs #21147.
-rw-r--r--django/core/cache/backends/memcached.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 87f05f973b..d5058c1e73 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -5,18 +5,11 @@ import pickle
from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT
from django.utils import six
-from django.utils.deprecation import RenameMethodsBase, RemovedInDjango19Warning
from django.utils.encoding import force_str
from django.utils.functional import cached_property
-class BaseMemcachedCacheMethods(RenameMethodsBase):
- renamed_methods = (
- ('_get_memcache_timeout', 'get_backend_timeout', RemovedInDjango19Warning),
- )
-
-
-class BaseMemcachedCache(six.with_metaclass(BaseMemcachedCacheMethods, BaseCache)):
+class BaseMemcachedCache(BaseCache):
def __init__(self, server, params, library, value_not_found_exception):
super(BaseMemcachedCache, self).__init__(params)
if isinstance(server, six.string_types):