summaryrefslogtreecommitdiffstats
path: root/ipatests/test_ipaserver/httptest.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipatests/test_ipaserver/httptest.py')
-rw-r--r--ipatests/test_ipaserver/httptest.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ipatests/test_ipaserver/httptest.py b/ipatests/test_ipaserver/httptest.py
index 7f1b5b136..891364c06 100644
--- a/ipatests/test_ipaserver/httptest.py
+++ b/ipatests/test_ipaserver/httptest.py
@@ -20,9 +20,10 @@
Base class for HTTP request tests
"""
-import urllib
import httplib
+from six.moves import urllib
+
from ipalib import api
class Unauthorized_HTTP_test(object):
@@ -41,7 +42,9 @@ class Unauthorized_HTTP_test(object):
:param key When not None, overrides default app_uri
"""
if params is not None:
- params = urllib.urlencode(params, True)
+ # urlencode *can* take two arguments
+ # pylint: disable=too-many-function-args
+ params = urllib.parse.urlencode(params, True)
url = 'https://' + self.host + self.app_uri
headers = {'Content-Type' : self.content_type,