mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Took advantage of django.utils.six.moves.urllib.*.

Browse Source
This commit is contained in:
Aymeric Augustin
2013-09-05 14:38:59 -05:00
parent ed9cd4fd8b
commit 6a6428a36f
31 changed files with 50 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/template_tests/tests.py
View File

@@ -13,10 +13,6 @@ import os
import sys
import traceback
import unittest
try:
from urllib.parse import urljoin
except ImportError: # Python 2
from urlparse import urljoin
import warnings
from django import template
@@ -33,6 +29,7 @@ from django.utils._os import upath
from django.utils.translation import activate, deactivate
from django.utils.safestring import mark_safe
from django.utils import six
from django.utils.six.moves.urllib.parse import urljoin
from i18n import TransRealMixin