commit 3dcacee74aee6e6d4e746d7c6fc774fcaa95d1c4
author Mike Frysinger <vapier@chromium.org> Fri Aug 23 17:09:11 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Sep 05 17:30:45 2019 +0000
tree 1375dea03c673ce4eb4182bfe7f6ecc677b3443b
parent d3de8dfbbb599f84b095160b0ef04a6f406c9271

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>

api/controller/binhost.py

diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index f3623fa..e92c8fd 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -9,7 +9,8 @@
 
 import os
 import shutil
-import urlparse
+
+from six.moves import urllib
 
 from chromite.api import controller
 from chromite.api import validate
@@ -95,7 +96,7 @@
   if config.validate_only:
     return controller.RETURN_CODE_VALID_INPUT
 
-  parsed_uri = urlparse.urlparse(uri)
+  parsed_uri = urllib.parse.urlparse(uri)
   upload_uri = gs.GetGsURL(parsed_uri.netloc, for_gsutil=True).rstrip('/')
   upload_path = parsed_uri.path.lstrip('/')
 
@@ -140,7 +141,7 @@
   if config.validate_only:
     return controller.RETURN_CODE_VALID_INPUT
 
-  parsed_uri = urlparse.urlparse(uri)
+  parsed_uri = urllib.parse.urlparse(uri)
   upload_uri = gs.GetGsURL(parsed_uri.netloc, for_gsutil=True).rstrip('/')
   upload_path = parsed_uri.path.lstrip('/')