From f9f792eb04dfd48d93682070583f473166b490ae Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 5 Sep 2013 14:38:59 -0500 Subject: [1.6.x] Took advantage of django.utils.six.moves.urllib.*. Backport of 6a6428a36 from master. --- tests/template_tests/tests.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/template_tests') 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 -- cgit v1.3