fixup

local-requirements.txt

@@ -1,4 +1,3 @@
 # migrid dependencies on a format suitable for pip install as described on
 # https://pip.pypa.io/en/stable/reference/requirement-specifiers/
 autopep8
-urllib3

mig/server/grid_openid.py

@@ -326,10 +326,10 @@ class ThreadedOpenIDHTTPServer(ThreadingMixIn, OpenIDHTTPServer):
 
     def __init__(self, configuration, **kwargs):
         self._started = threading.Event()
-        super(ThreadedOpenIDHTTPServer, self).__init__(configuration, **kwargs)
+        OpenIDHTTPServer.__init__(self, configuration, **kwargs)
 
     def server_activate(self):
-        super(ThreadedOpenIDHTTPServer, self).server_activate()
+        OpenIDHTTPServer.server_activate(self)
         self._started.set()
 
     def wait_start(self):

tests/test_mig_server_grid_openid.py

@@ -2,7 +2,6 @@
 import os
 import sys
 from threading import Thread
-import urllib3
 
 from tests.support import PY2, MIG_BASE, testmain, MigTestCase
 
@@ -15,6 +14,12 @@
 _TEST_CONF_FILE = os.path.join(_TEST_CONF_DIR, "MiGserver.conf")
 
 
+if PY2:
+    from urllib2 import urlopen
+else:
+    from urllib.request import urlopen
+
+
 class TestThreadedOpenIDServerExecutor(Thread):
     def __init__(self, configuration):
         super(TestThreadedOpenIDServerExecutor, self).__init__()
@@ -66,10 +71,11 @@ def test_xxx(self):
         self.server_thread.start()
         self.server_thread.wait_until_ready()
 
-        response = urllib3.request(
-            'GET', self._test_url('/'), retries=0, timeout=2000)
+        response = urlopen(self._test_url('/'), None, timeout=2000)
+        response.read()
 
-        self.assertEqual(response.status, 200)
+        status = response.getcode()
+        self.assertEqual(status, 200)
 
     @staticmethod
     def _make_server(configuration):