Ticket #9180: 9180.diff

django/core/cache/backends/memcached.py

@@ -1 +1 @@
 "Memcached cache backend"
 
 from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
-from django.utils.encoding import smart_unicode, smart_str
+from django.utils.encoding import smart_unicode, smart_str, DjangoUnicodeDecodeError
 
 try:
     import cmemcache as memcache
@@ -27 +27 @@
             return default
         else:
             if isinstance(val, basestring):
-                return smart_unicode(val)
+                try:
+                    return smart_unicode(val)
+                except DjangoUnicodeDecodeError:
+                    return val
             else:
                 return val
 

tests/regressiontests/cache/tests.py

@@ -21 +21 @@
 class C:
     def m(n):
         return 24
+
+# The simplest possible GIF: a 43-byte, 1x1-pixel transparent image
+EMPTY_GIF_BYTES = 'GIF89a\x01\x00\x01\x00\xf0\x00\x00\xb0\x8cZ\x00\x00\x00!\xf9\x04\x00\x00\x00\x00\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;'
+
 
 class Cache(unittest.TestCase):
     def test_simple(self):
@@ -105 +109 @@
             cache.set(key, value)
             self.assertEqual(cache.get(key), value)
 
+    def test_binary(self):
+        cache.set("binary_stuff", EMPTY_GIF_BYTES)
+        self.assertEqual(cache.get("binary_stuff"), EMPTY_GIF_BYTES)
+
 
 class FileBasedCacheTests(unittest.TestCase):
     """