mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
unicode: Found a str() call that had snuck through the cracks.
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2cebf777e3
commit
d5946c5946
@ -20,6 +20,7 @@ A example: i18n middleware would need to distinguish caches by the
|
|||||||
import datetime, md5, re
|
import datetime, md5, re
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
|
from django.utils.encoding import smart_str
|
||||||
|
|
||||||
cc_delim_re = re.compile(r'\s*,\s*')
|
cc_delim_re = re.compile(r'\s*,\s*')
|
||||||
|
|
||||||
@ -46,7 +47,7 @@ def patch_cache_control(response, **kwargs):
|
|||||||
if t[1] == True:
|
if t[1] == True:
|
||||||
return t[0]
|
return t[0]
|
||||||
else:
|
else:
|
||||||
return t[0] + '=' + str(t[1])
|
return t[0] + '=' + smart_str(t[1])
|
||||||
|
|
||||||
if response.has_header('Cache-Control'):
|
if response.has_header('Cache-Control'):
|
||||||
cc = cc_delim_re.split(response['Cache-Control'])
|
cc = cc_delim_re.split(response['Cache-Control'])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user