Merge "py3: Get urllib modules from six"

fuelclient/cli/formatting.py

@@ -20,12 +20,12 @@ from operator import itemgetter
 import os
 import sys
 from time import sleep
-import urllib2
 
 import six
 
 from fuelclient.cli.error import DeployProgressError
 from fuelclient.cli.error import exit_with_error
+from six.moves import urllib
 
 
 def format_table(data, acceptable_keys=None, column_to_join=None):
@@ -116,8 +116,8 @@ def download_snapshot_with_progress_bar(
         os.path.abspath(directory),
         url.split('/')[-1]
     )
-    request = urllib2.Request(url, headers={'x-auth-token': auth_token})
-    download_handle = urllib2.urlopen(request)
+    request = urllib.request.Request(url, headers={'x-auth-token': auth_token})
+    download_handle = urllib.request.urlopen(request)
     with open(file_name, 'wb') as file_handle:
         meta = download_handle.info()
         file_size = int(meta.getheaders("Content-Length")[0])

fuelclient/tests/unit/v1/test_authentication.py

@@ -16,7 +16,7 @@
 
 from mock import Mock
 from mock import patch
-import urllib2
+from six.moves import urllib
 
 from fuelclient import fuelclient_settings
 from fuelclient.tests import base
@@ -38,7 +38,7 @@ class TestAuthentication(base.UnitTestCase):
         self.assertEqual(args['username'], username)
         self.assertEqual(args['password'], password)
         self.assertEqual(args['tenant_name'], tenant_name)
-        pr = urllib2.urlparse.urlparse(args['auth_url'])
+        pr = urllib.parse.urlparse(args['auth_url'])
         self.assertEqual(conf.SERVER_ADDRESS, pr.hostname)
         self.assertEqual(int(conf.LISTEN_PORT), int(pr.port))
         self.assertEqual('/keystone/v2.0', pr.path)