Merge "Clean up unnecessary import of urlparse module"

Jenkins · openstack-gerrit · commit 77f2e9846649 · 2016-03-01T23:51:00.000Z
diff --git a/openstackclient/api/object_store_v1.py b/openstackclient/api/object_store_v1.py
@@ -20,11 +20,6 @@
 import six
 from six.moves import urllib
 
-try:
-    from urllib.parse import urlparse  # noqa
-except ImportError:
-    from urlparse import urlparse  # noqa
-
 from openstackclient.api import api
 from openstackclient.common import utils
 
@@ -525,7 +520,7 @@ def account_unset(
             self.create("", headers=headers)
 
     def _find_account_id(self):
-        url_parts = urlparse(self.endpoint)
+        url_parts = urllib.parse.urlparse(self.endpoint)
         return url_parts.path.split('/')[-1]
 
     def _unset_properties(self, properties, header_tag):
