From ae88e73fa630694a152b54df68d53ce535312e45 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 29 Aug 2012 22:40:51 +0200 Subject: 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. --- django/core/cache/backends/memcached.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/core/cache') 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) -- cgit v1.3