openstack/python-novaclient
Code Issues Proposed changes

Merge "Fix W503 line break before binary operator"

Browse Source
This commit is contained in:
Jenkins
2016-01-12 01:43:46 +00:00
committed by Gerrit Code Review
parent 2ac32e0f18 fa3a8edf20
commit 797ae2af69
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
novaclient/client.py
View File

@@ -595,9 +595,9 @@ class HTTPClient(object):
def _save_keys(self):
# Store the token/mgmt url in the keyring for later requests.
if (self.keyring_saver and self.os_cache and not self.keyring_saved
and self.auth_token and self.management_url
and self.tenant_id):
if (self.keyring_saver and self.os_cache and not self.keyring_saved and
self.auth_token and self.management_url and
self.tenant_id):
self.keyring_saver.save(self.auth_token,
self.management_url,
self.tenant_id)

4
novaclient/tests/unit/v2/fakes.py
View File

@@ -137,8 +137,8 @@ class FakeHTTPClient(base_client.HTTPClient):
def get_endpoint(self):
# check if endpoint matches expected format (eg, v2.1)
if (hasattr(self, 'endpoint_type')
and ENDPOINT_TYPE_RE.search(self.endpoint_type)):
if (hasattr(self, 'endpoint_type') and
ENDPOINT_TYPE_RE.search(self.endpoint_type)):
return "http://nova-api:8774/%s/" % self.endpoint_type
else:
return (