Ticket #14703: 13686_14703_unicode_in_memcached_backend_r14757.diff

django/core/cache/backends/memcached.py

@@ -40 +40 @@
 
     def add(self, key, value, timeout=0, version=None):
         key = self.make_key(key, version=version)
-        if isinstance(value, unicode):
-            value = value.encode('utf-8')
         return self._cache.add(key, value, self._get_memcache_timeout(timeout))
 
     def get(self, key, default=None, version=None):
@@ -106 +104 @@
         safe_data = {}
         for key, value in data.items():
             key = self.make_key(key, version=version)
-            if isinstance(value, unicode):
-                value = value.encode('utf-8')
             safe_data[key] = value
         self._cache.set_multi(safe_data, self._get_memcache_timeout(timeout))
 

tests/regressiontests/cache/tests.py

@@ -315 +315 @@
             u'Iñtërnâtiônàlizætiøn': u'Iñtërnâtiônàlizætiøn2',
             u'ascii': {u'x' : 1 }
             }
+        # Test `set`
         for (key, value) in stuff.items():
             self.cache.set(key, value)
             self.assertEqual(self.cache.get(key), value)
 
+        # Test `add`
+        for (key, value) in stuff.items():
+            self.cache.delete(key)
+            self.cache.add(key, value)
+            self.assertEqual(self.cache.get(key), value)
+
+        # Test `set_many`
+        for (key, value) in stuff.items():
+            self.cache.delete(key)
+        self.cache.set_many(stuff)
+        for (key, value) in stuff.items():
+            self.assertEqual(self.cache.get(key), value)
+
     def test_binary_string(self):
         # Binary strings should be cachable
         from zlib import compress, decompress