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

Backport of 6a6428a36 from master.

1 files changed, 1 insertions, 4 deletions

diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 76712a09a6..b2f35b1a8d 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -13,10 +13,6 @@ import time
 import os
 import sys
 import traceback
-try:
-    from urllib.parse import urljoin
-except ImportError:     # Python 2
-    from urlparse import urljoin
 import warnings
 
 from django import template
@@ -34,6 +30,7 @@ from django.utils._os import upath
 from django.utils.translation import activate, deactivate, ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils import six
+from django.utils.six.moves.urllib.parse import urljoin
 from django.utils.tzinfo import LocalTimezone
 
 from i18n import TransRealMixin