summaryrefslogtreecommitdiff
path: root/django/core/cache
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-29 22:40:51 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-30 15:46:16 +0200
commitae88e73fa630694a152b54df68d53ce535312e45 (patch)
treee1eda66e1ccb36c9b66504d565a2cfcb856ed926 /django/core/cache
parent36df198e4b2f03102389e6e8aa08365c0d0bd974 (diff)
Replaced some smart_xxx by force_xxx equivalent
smart_str/smart_text should only be used when a potential lazy string should be preserved in the result of the function call.
Diffstat (limited to 'django/core/cache')
-rw-r--r--django/core/cache/backends/memcached.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 75ce26d20e..426a0a15c0 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -6,7 +6,7 @@ from threading import local
from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
from django.utils import six
-from django.utils.encoding import smart_str
+from django.utils.encoding import force_str
class BaseMemcachedCache(BaseCache):
def __init__(self, server, params, library, value_not_found_exception):
@@ -53,7 +53,7 @@ class BaseMemcachedCache(BaseCache):
def make_key(self, key, version=None):
# Python 2 memcache requires the key to be a byte string.
- return smart_str(super(BaseMemcachedCache, self).make_key(key, version))
+ return force_str(super(BaseMemcachedCache, self).make_key(key, version))
def add(self, key, value, timeout=0, version=None):
key = self.make_key(key, version=version)