import urllib from six.moves
Python 3 has consolidated a number of related url modules under
urllib. Use six.moves.urllib to do the transition ourselves.
The urllib.parse conversion is pretty straightforward.
The urllib.request conversion is easy too.
The urllib2 update takes a bit more effort to converge.
BUG=chromium:997354
TEST=unittests pass
Change-Id: I99d110f08570f8eafdef9686887fb0f86972c654
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1774316
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index f99c4c0..715ca0a 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -22,7 +22,8 @@
import re
import resource
import sys
-import urlparse
+
+from six.moves import urllib
from chromite.lib import constants
from chromite.lib import cgroups
@@ -117,7 +118,7 @@
status_re = re.compile(r'^HTTP/[0-9]+(\.[0-9]+)? 200')
# pylint: disable=undefined-loop-variable
for url in urls:
- parsed = urlparse.urlparse(url)
+ parsed = urllib.parse.urlparse(url)
tarball_name = os.path.basename(parsed.path)
if parsed.scheme in ('', 'file'):
if os.path.exists(parsed.path):