Merge "Remove six.moves.urllib"

tackerclient/shell.py

@@ -32,7 +32,8 @@ from keystoneclient import discover
 from keystoneclient import exceptions as ks_exc
 from keystoneclient import session
 from oslo_utils import encodeutils
-import six.moves.urllib.parse as urlparse
+
+from urllib import parse as urlparse
 
 from cliff import app
 from cliff import commandmanager

tackerclient/tacker/v1_0/nfvo/vim_utils.py

@@ -13,7 +13,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import six.moves.urllib.parse as urlparse
+from urllib import parse as urlparse
 
 from tackerclient.common import exceptions
 

tackerclient/tests/unit/test_cli10.py

@@ -20,10 +20,11 @@ import urllib
 import contextlib
 import fixtures
 import six
-import six.moves.urllib.parse as urlparse
 import sys
 import testtools
 
+from urllib import parse as urlparse
+
 from tackerclient.common import constants
 from tackerclient.common import exceptions
 from tackerclient import shell

tackerclient/v1_0/client.py

@@ -19,7 +19,8 @@ import logging
 import time
 
 import requests
-import six.moves.urllib.parse as urlparse
+
+from urllib import parse as urlparse
 
 from tackerclient import client
 from tackerclient.common import constants