Python 3 Fix: use six.moves.urillib
Use six.moves.urllib instead of urllib2 for python 3 compatability.
Change-Id: Ia12a91d6164cd32080bafdeb5f4829e2d35f5e83
diff --git a/tests/base.py b/tests/base.py
index de5601b..3c28a72 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -22,6 +22,7 @@
import os
import pprint
from six.moves import queue as Queue
+from six.moves import urllib
import random
import re
import select
@@ -32,12 +33,10 @@
import swiftclient
import threading
import time
-import urllib2
import git
import gear
import fixtures
-import six.moves.urllib.parse as urlparse
import statsd
import testtools
from git import GitCommandError
@@ -479,7 +478,7 @@
self.url = url
def read(self):
- res = urlparse.urlparse(self.url)
+ res = urllib.parse.urlparse(self.url)
path = res.path
project = '/'.join(path.split('/')[2:-2])
ret = '001e# service=git-upload-pack\n'
@@ -947,12 +946,12 @@
self.sched.registerConnections(self.connections)
def URLOpenerFactory(*args, **kw):
- if isinstance(args[0], urllib2.Request):
+ if isinstance(args[0], urllib.request.Request):
return old_urlopen(*args, **kw)
return FakeURLOpener(self.upstream_root, *args, **kw)
- old_urlopen = urllib2.urlopen
- urllib2.urlopen = URLOpenerFactory
+ old_urlopen = urllib.request.urlopen
+ urllib.request.urlopen = URLOpenerFactory
self.merge_server = zuul.merger.server.MergeServer(self.config,
self.connections)