openstack/python-manilaclient
Code Issues Proposed changes

Use six.moves.urllib.parse for py2/3 compat

Browse Source 
Instead of try/except blocks, just use the six module which is already
in use in other places.

Also remove a Python 2.5 compat construct. Python 2.5 is no longer supported.

Change-Id: Idb13d861b0f8c567d1e44ce5bf6c60da12a24d18
This commit is contained in:
Thomas Bechtold 2014-12-28 10:56:17 +01:00
parent 35fc635556
commit 863b41053f
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manilaclient/client.py
View File

@ -23,24 +23,16 @@ from __future__ import print_function
import logging import logging
import os import os
try:
import urlparse
except ImportError:
import urllib.parse as urlparse
try: try:
from eventlet import sleep from eventlet import sleep
except ImportError: except ImportError:
from time import sleep # noqa from time import sleep # noqa
# Python 2.5 compat fix
if not hasattr(urlparse, 'parse_qsl'):
import cgi
urlparse.parse_qsl = cgi.parse_qsl
from oslo.serialization import jsonutils from oslo.serialization import jsonutils
from oslo.utils import importutils from oslo.utils import importutils
import requests import requests
from six.moves.urllib import parse
from manilaclient import exceptions from manilaclient import exceptions
from manilaclient import service_catalog from manilaclient import service_catalog
@ -296,7 +288,7 @@ class HTTPClient(object):
self.keyring_saver.save_password() self.keyring_saver.save_password()
def authenticate(self): def authenticate(self):
magic_tuple = urlparse.urlsplit(self.auth_url) magic_tuple = parse.urlsplit(self.auth_url)
scheme, netloc, path, query, frag = magic_tuple scheme, netloc, path, query, frag = magic_tuple
port = magic_tuple.port port = magic_tuple.port
if port is None: if port is None:
@ -310,8 +302,8 @@ class HTTPClient(object):
# TODO(sandy): Assume admin endpoint is 35357 for now. # TODO(sandy): Assume admin endpoint is 35357 for now.
# Ideally this is going to have to be provided by the service catalog. # Ideally this is going to have to be provided by the service catalog.
new_netloc = netloc.replace(':%d' % port, ':%d' % (35357,)) new_netloc = netloc.replace(':%d' % port, ':%d' % (35357,))
admin_url = urlparse.urlunsplit((scheme, new_netloc, admin_url = parse.urlunsplit((scheme, new_netloc,
path, query, frag)) path, query, frag))
auth_url = self.auth_url auth_url = self.auth_url
if self.version == "v2.0": if self.version == "v2.0":

7
manilaclient/tests/unit/v1/fake_clients.py
View File

@ -12,10 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
try: from six.moves.urllib import parse
import urlparse
except ImportError:
import urllib.parse as urlparse
from manilaclient import client as base_client from manilaclient import client as base_client
from manilaclient.tests.unit import fakes from manilaclient.tests.unit import fakes
@ -48,7 +45,7 @@ class FakeHTTPClient(base_client.HTTPClient):
assert 'body' in kwargs assert 'body' in kwargs
# Call the method # Call the method
args = urlparse.parse_qsl(urlparse.urlparse(url)[4]) args = parse.parse_qsl(parse.urlparse(url)[4])
kwargs.update(args) kwargs.update(args)
munged_url = url.rsplit('?', 1)[0] munged_url = url.rsplit('?', 1)[0]
munged_url = munged_url.strip('/').replace('/', '_').replace('.', '_') munged_url = munged_url.strip('/').replace('/', '_').replace('.', '_')