summaryrefslogtreecommitdiff
path: root/tests/test_client
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-09-05 14:38:59 -0500
committerClaude Paroz <claude@2xlibre.net>2013-09-10 21:29:31 +0200
commitf9f792eb04dfd48d93682070583f473166b490ae (patch)
treec66c3d474e808d664b3b24b94fdc3d5344295c4f /tests/test_client
parent960f5bc75901f76e9b4b356f98b22b494fb47611 (diff)
[1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
Diffstat (limited to 'tests/test_client')
-rw-r--r--tests/test_client/views.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/test_client/views.py b/tests/test_client/views.py
index 76296cb80d..08cdd8c198 100644
--- a/tests/test_client/views.py
+++ b/tests/test_client/views.py
@@ -1,7 +1,3 @@
-try:
- from urllib.parse import urlencode
-except ImportError: # Python 2
- from urllib import urlencode
from xml.dom.minidom import parseString
from django.contrib.auth.decorators import login_required, permission_required
@@ -13,6 +9,7 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
from django.shortcuts import render_to_response
from django.template import Context, Template
from django.utils.decorators import method_decorator
+from django.utils.six.moves.urllib.parse import urlencode
def get_view(request):
"A simple view that expects a GET request, and returns a rendered template"