[1.6.x] Took advantage of django.utils.six.moves.urllib.*.

Backport of 6a6428a36 from master.

2 files changed, 2 insertions, 9 deletions

diff --git a/django/test/client.py b/django/test/client.py
index fb9a9e7a02..b4bdde6931 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -6,11 +6,6 @@ import re
 import mimetypes
 from copy import copy
 from io import BytesIO
-try:
-    from urllib.parse import unquote, urlparse, urlsplit
-except ImportError:     # Python 2
-    from urllib import unquote
-    from urlparse import urlparse, urlsplit
 
 from django.conf import settings
 from django.contrib.auth import authenticate, login, logout, get_user_model
@@ -28,6 +23,7 @@ from django.utils.http import urlencode
 from django.utils.importlib import import_module
 from django.utils.itercompat import is_iterable
 from django.utils import six
+from django.utils.six.moves.urllib.parse import unquote, urlparse, urlsplit
 from django.test.utils import ContextList
 
 __all__ = ('Client', 'RequestFactory', 'encode_file', 'encode_multipart')
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 984d21ce18..b70fea69e2 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -8,10 +8,6 @@ import json
 import os
 import re
 import sys
-try:
-    from urllib.parse import urlsplit, urlunsplit
-except ImportError:     # Python 2
-    from urlparse import urlsplit, urlunsplit
 import select
 import socket
 import threading
@@ -39,6 +35,7 @@ from django.test.utils import (CaptureQueriesContext, ContextList,
     override_settings, compare_xml)
 from django.utils import six, unittest as ut2
 from django.utils.encoding import force_text
+from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
 from django.utils.unittest import skipIf # Imported here for backward compatibility
 from django.utils.unittest.util import safe_repr
 from django.views.static import serve