Merged Unicode branch into trunk (r4952:5608). This should be fully

backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/utils/cache.py

@@ -20,6 +20,7 @@ A example: i18n middleware would need to distinguish caches by the
 import datetime, md5, re
 from django.conf import settings
 from django.core.cache import cache
+from django.utils.encoding import smart_str
 
 cc_delim_re = re.compile(r'\s*,\s*')
 
@@ -46,7 +47,7 @@ def patch_cache_control(response, **kwargs):
         if t[1] == True:
             return t[0]
         else:
-            return t[0] + '=' + str(t[1])
+            return t[0] + '=' + smart_str(t[1])
 
     if response.has_header('Cache-Control'):
         cc = cc_delim_re.split(response['Cache-Control'])