Imported Debian patch 4.0.5-6~numeezy

ipatests/test_ipaserver/httptest.py

@@ -20,17 +20,11 @@
 Base class for HTTP request tests
 """
 
-from six.moves import urllib
+import urllib
+import httplib
 
 from ipalib import api
 
-# Python 3 rename. The package is available in "six.moves.http_client", but
-# pylint cannot handle classes from that alias
-try:
-    import httplib
-except ImportError:
-    import http.client as httplib
-
 class Unauthorized_HTTP_test(object):
     """
     Base class for simple HTTP request tests executed against URI
@@ -47,9 +41,7 @@ class Unauthorized_HTTP_test(object):
         :param key When not None, overrides default app_uri
         """
         if params is not None:
-            # urlencode *can* take two arguments
-            # pylint: disable=too-many-function-args
-            params = urllib.parse.urlencode(params, True)
+            params = urllib.urlencode(params, True)
         url = 'https://' + self.host + self.app_uri
 
         headers = {'Content-Type' : self.content_type,