diff options
| author | Tim Graham <timograham@gmail.com> | 2014-03-31 07:54:22 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-31 07:54:22 -0400 |
| commit | 981b864fbd28590c4ac829ce55bb7543f57d1de8 (patch) | |
| tree | 5987e6598dba3ab0fd3b8f9daad428147526e8bf /django/http/response.py | |
| parent | 4339e9a92d98371a50a6fe54ab7ea0c602ecee28 (diff) | |
Replaced urllib/urlparse imports with from django.utils.six.moves.
Diffstat (limited to 'django/http/response.py')
| -rw-r--r-- | django/http/response.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/http/response.py b/django/http/response.py index 602e03284d..27d99a621d 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -5,10 +5,6 @@ import json import sys import time from email.header import Header -try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse from django.conf import settings from django.core import signals @@ -20,6 +16,7 @@ from django.utils import six, timezone from django.utils.encoding import force_bytes, force_text, iri_to_uri from django.utils.http import cookie_date from django.utils.six.moves import map +from django.utils.six.moves.urllib.parse import urlparse # See http://www.iana.org/assignments/http-status-codes |
