p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #27795 -- Removed force_bytes() usage in django/utils/cache.py.

This commit is contained in:
Jon Dufresne 2018-08-28 05:03:23 -07:00 committed by Tim Graham
parent 5311a36da5
commit ee184e13cb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/cache.py
View File

@ -23,7 +23,7 @@ import time
from django.conf import settings from django.conf import settings
from django.core.cache import caches from django.core.cache import caches
from django.http import HttpResponse, HttpResponseNotModified from django.http import HttpResponse, HttpResponseNotModified
from django.utils.encoding import force_bytes, iri_to_uri from django.utils.encoding import iri_to_uri
from django.utils.http import ( from django.utils.http import (
http_date, parse_etags, parse_http_date_safe, quote_etag, http_date, parse_etags, parse_http_date_safe, quote_etag,
) )
@ -302,8 +302,8 @@ def _generate_cache_key(request, method, headerlist, key_prefix):
for header in headerlist: for header in headerlist:
value = request.META.get(header) value = request.META.get(header)
if value is not None: if value is not None:
ctx.update(force_bytes(value)) ctx.update(value.encode())
url = hashlib.md5(force_bytes(iri_to_uri(request.build_absolute_uri()))) url = hashlib.md5(iri_to_uri(request.build_absolute_uri()).encode('ascii'))
cache_key = 'views.decorators.cache.cache_page.%s.%s.%s.%s' % ( cache_key = 'views.decorators.cache.cache_page.%s.%s.%s.%s' % (
key_prefix, method, url.hexdigest(), ctx.hexdigest()) key_prefix, method, url.hexdigest(), ctx.hexdigest())
return _i18n_cache_key_suffix(request, cache_key) return _i18n_cache_key_suffix(request, cache_key)
@ -311,7 +311,7 @@ def _generate_cache_key(request, method, headerlist, key_prefix):
def _generate_cache_header_key(key_prefix, request): def _generate_cache_header_key(key_prefix, request):
"""Return a cache key for the header cache.""" """Return a cache key for the header cache."""
url = hashlib.md5(force_bytes(iri_to_uri(request.build_absolute_uri()))) url = hashlib.md5(iri_to_uri(request.build_absolute_uri()).encode('ascii'))
cache_key = 'views.decorators.cache.cache_header.%s.%s' % ( cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
key_prefix, url.hexdigest()) key_prefix, url.hexdigest())
return _i18n_cache_key_suffix(request, cache_key) return _i18n_cache_key_suffix(request, cache_key)