summaryrefslogtreecommitdiff
path: root/django/http
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2013-06-28 20:50:36 -0300
committerRamiro Morales <cramm0@gmail.com>2013-06-28 21:48:16 -0300
commit8eadbc5a03d06f5bfedfa3fad35ad0801d2ab6ff (patch)
treec9c1639a774a7dae0601dc680fe3c0a4d3648196 /django/http
parent6ba69c8456461aa30f415331b948f7f92dfcf211 (diff)
Removed 'mimetype' arguments from a few places, as per deprecation TL.
This includes HttpResponse and co. __init__() methods, django.shortcuts.render_to_response() and the index(), sitemap() sitemap app views.
Diffstat (limited to 'django/http')
-rw-r--r--django/http/response.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/django/http/response.py b/django/http/response.py
index 784f21174e..552161c212 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -98,7 +98,7 @@ class HttpResponseBase(six.Iterator):
status_code = 200
reason_phrase = None # Use default reason phrase for status code.
- def __init__(self, content_type=None, status=None, reason=None, mimetype=None):
+ def __init__(self, content_type=None, status=None, reason=None):
# _headers is a mapping of the lower-case name to the original case of
# the header (required for working with legacy systems) and the header
# value. Both the name of the header and its value are ASCII strings.
@@ -108,11 +108,6 @@ class HttpResponseBase(six.Iterator):
# This parameter is set by the handler. It's necessary to preserve the
# historical behavior of request_finished.
self._handler_class = None
- if mimetype:
- warnings.warn("Using mimetype keyword argument is deprecated, use"
- " content_type instead",
- DeprecationWarning, stacklevel=2)
- content_type = mimetype
if not content_type:
content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
self._charset)