gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 15 deletions

diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index 495cc92822..c136ce4f4d 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -19,8 +19,10 @@ from cgi import parse_qsl
 from django.conf import settings
 from django.core.cache.backends.base import InvalidCacheBackendError
 
+# Name for use in settings file --> name of module in "backends" directory.
+# Any backend scheme that is not in this dictionary is treated as a Python
+# import path to a custom backend.
 BACKENDS = {
-    # name for use in settings file --> name of module in "backends" directory
     'memcached': 'memcached',
     'locmem': 'locmem',
     'file': 'filebased',
@@ -28,24 +30,12 @@ BACKENDS = {
     'dummy': 'dummy',
 }
 
-DEPRECATED_BACKENDS = {
-    # deprecated backend --> replacement module
-    'simple': 'locmem',
-}
-
 def get_cache(backend_uri):
     if backend_uri.find(':') == -1:
         raise InvalidCacheBackendError, "Backend URI must start with scheme://"
     scheme, rest = backend_uri.split(':', 1)
     if not rest.startswith('//'):
         raise InvalidCacheBackendError, "Backend URI must start with scheme://"
-    if scheme in DEPRECATED_BACKENDS:
-        import warnings
-        warnings.warn("'%s' backend is deprecated. Use '%s' instead." % 
-            (scheme, DEPRECATED_BACKENDS[scheme]), DeprecationWarning)
-        scheme = DEPRECATED_BACKENDS[scheme]
-    if scheme not in BACKENDS:
-        raise InvalidCacheBackendError, "%r is not a valid cache backend" % scheme
 
     host = rest[2:]
     qpos = rest.find('?')
@@ -57,7 +47,10 @@ def get_cache(backend_uri):
     if host.endswith('/'):
         host = host[:-1]
 
-    cache_class = getattr(__import__('django.core.cache.backends.%s' % BACKENDS[scheme], {}, {}, ['']), 'CacheClass')
-    return cache_class(host, params)
+    if scheme in BACKENDS:
+        module = __import__('django.core.cache.backends.%s' % BACKENDS[scheme], {}, {}, [''])
+    else:
+        module = __import__(scheme, {}, {}, [''])
+    return getattr(module, 'CacheClass')(host, params)
 
 cache = get_cache(settings.CACHE_BACKEND)