From bb0b4b705b508451567bcada9106b91b8fca9e86 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 25 Apr 2016 07:56:07 -0400 Subject: Fixed #26052 -- Moved conditional_content_removal() processing to the test client. --- django/http/__init__.py | 2 -- django/http/utils.py | 28 ---------------------------- 2 files changed, 30 deletions(-) delete mode 100644 django/http/utils.py (limited to 'django/http') diff --git a/django/http/__init__.py b/django/http/__init__.py index 00a303c11c..491239bf8a 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -9,7 +9,6 @@ from django.http.response import ( HttpResponsePermanentRedirect, HttpResponseRedirect, HttpResponseServerError, JsonResponse, StreamingHttpResponse, ) -from django.http.utils import conditional_content_removal __all__ = [ 'SimpleCookie', 'parse_cookie', 'HttpRequest', 'QueryDict', @@ -19,5 +18,4 @@ __all__ = [ 'HttpResponseBadRequest', 'HttpResponseForbidden', 'HttpResponseNotFound', 'HttpResponseNotAllowed', 'HttpResponseGone', 'HttpResponseServerError', 'Http404', 'BadHeaderError', 'JsonResponse', 'FileResponse', - 'conditional_content_removal', ] diff --git a/django/http/utils.py b/django/http/utils.py deleted file mode 100644 index 3ea71cb892..0000000000 --- a/django/http/utils.py +++ /dev/null @@ -1,28 +0,0 @@ -""" -Functions that modify an HTTP request or response in some way. -""" - -# This group of functions are run as part of the response handling, after -# everything else, including all response middleware. Think of them as -# "compulsory response middleware". Be careful about what goes here, because -# it's a little fiddly to override this behavior, so they should be truly -# universally applicable. - - -def conditional_content_removal(request, response): - """ - Removes the content of responses for HEAD requests, 1xx, 204 and 304 - responses. Ensures compliance with RFC 2616, section 4.3. - """ - if 100 <= response.status_code < 200 or response.status_code in (204, 304): - if response.streaming: - response.streaming_content = [] - else: - response.content = b'' - response['Content-Length'] = '0' - if request.method == 'HEAD': - if response.streaming: - response.streaming_content = [] - else: - response.content = b'' - return response -- cgit v1.3