diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-03-28 21:30:05 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-03-28 21:30:05 +0000 |
| commit | 1f3fc7bc9f8fca6b19b4b88852e5fce5f3dcf347 (patch) | |
| tree | c173e5a0b31ab0d9b90cfd323d6e592fd8bfb177 /django/core/cache | |
| parent | d2c03a37798adf1975d96c12e927bed75db7feed (diff) | |
boulder-oracle-sprint: Merged to [4839], part two.
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/cache')
| -rw-r--r-- | django/core/cache/backends/memcached.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py index 180f95da73..1ab019221a 100644 --- a/django/core/cache/backends/memcached.py +++ b/django/core/cache/backends/memcached.py @@ -3,9 +3,12 @@ from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError try: - import memcache + import cmemcache as memcache except ImportError: - raise InvalidCacheBackendError, "Memcached cache backend requires the 'memcache' library" + try: + import memcache + except: + raise InvalidCacheBackendError("Memcached cache backend requires either the 'memcache' or 'cmemcache' library") class CacheClass(BaseCache): def __init__(self, server, params): |