diff options
Diffstat (limited to 'django/utils/cache.py')
| -rw-r--r-- | django/utils/cache.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/django/utils/cache.py b/django/utils/cache.py index b1abbf0648..81fc44293e 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -20,12 +20,10 @@ import hashlib import logging import re import time -import warnings from django.conf import settings from django.core.cache import caches from django.http import HttpResponse, HttpResponseNotModified -from django.utils.deprecation import RemovedInDjango21Warning from django.utils.encoding import force_bytes, force_text, iri_to_uri from django.utils.http import ( http_date, parse_etags, parse_http_date_safe, quote_etag, @@ -248,18 +246,6 @@ def patch_response_headers(response, cache_timeout=None): cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS if cache_timeout < 0: cache_timeout = 0 # Can't have max-age negative - if settings.USE_ETAGS and not response.has_header('ETag'): - warnings.warn( - "The USE_ETAGS setting is deprecated in favor of " - "ConditionalGetMiddleware which sets the ETag regardless of the " - "setting. patch_response_headers() won't do ETag processing in " - "Django 2.1.", - RemovedInDjango21Warning - ) - if hasattr(response, 'render') and callable(response.render): - response.add_post_render_callback(set_response_etag) - else: - response = set_response_etag(response) if not response.has_header('Expires'): response['Expires'] = http_date(time.time() + cache_timeout) patch_cache_control(response, max_age=cache_timeout) |