diff options
| author | Joe Heck <heckj@mac.com> | 2012-06-01 18:07:26 -0700 |
|---|---|---|
| committer | Joe Heck <heckj@mac.com> | 2012-06-01 18:07:26 -0700 |
| commit | 52b392281ef301c4ee85ae071ec8e26facdcbbdc (patch) | |
| tree | e8d130985996627314e457dbd637157c34a1600d /keystoneclient/generic | |
| parent | aa9761433065a260dc2b571deb10957347a76d4e (diff) | |
| download | python-keystoneclient-52b392281ef301c4ee85ae071ec8e26facdcbbdc.tar.gz | |
pep8 1.1 changes and updates
Change-Id: I8bc3582bb3f35a3d841bb1e8c03b62ba61ff92d7
Diffstat (limited to 'keystoneclient/generic')
| -rw-r--r-- | keystoneclient/generic/client.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py index 01e4821..7fe5e0f 100644 --- a/keystoneclient/generic/client.py +++ b/keystoneclient/generic/client.py @@ -82,7 +82,8 @@ class Client(client.HTTPClient): try: httpclient = client.HTTPClient() resp, body = httpclient.request(url, "GET", - headers={'Accept': 'application/json'}) + headers={'Accept': + 'application/json'}) if resp.status in (200, 204): # in some cases we get No Content try: results = {} @@ -90,8 +91,8 @@ class Client(client.HTTPClient): results['message'] = "Keystone found at %s" % url version = body['version'] # Stable/diablo incorrect format - id, status, version_url = self._get_version_info( - version, url) + id, status, version_url = \ + self._get_version_info(version, url) results[str(id)] = {"id": id, "status": status, "url": version_url} @@ -100,8 +101,8 @@ class Client(client.HTTPClient): # Correct format results['message'] = "Keystone found at %s" % url for version in body['versions']['values']: - id, status, version_url = self._get_version_info( - version, url) + id, status, version_url = \ + self._get_version_info(version, url) results[str(id)] = {"id": id, "status": status, "url": version_url} @@ -142,7 +143,8 @@ class Client(client.HTTPClient): if not url.endswith("/"): url += '/' resp, body = httpclient.request("%sextensions" % url, "GET", - headers={'Accept': 'application/json'}) + headers={'Accept': + 'application/json'}) if resp.status in (200, 204): # in some cases we get No Content try: results = {} @@ -150,15 +152,17 @@ class Client(client.HTTPClient): if 'values' in body['extensions']: # Parse correct format (per contract) for extension in body['extensions']['values']: - alias, name = self._get_extension_info( - extension['extension']) + alias, name = \ + self._get_extension_info( + extension['extension'] + ) results[alias] = name return results else: # Support incorrect, but prevalent format for extension in body['extensions']: - alias, name = self._get_extension_info( - extension) + alias, name = \ + self._get_extension_info(extension) results[alias] = name return results else: |