diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-12 01:43:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-12 01:43:47 +0000 |
| commit | 797ae2af69e35186a9bbbfbcb00a8bb52de6f630 (patch) | |
| tree | 9c328892c195b9830c7d87ed2cee2d33f8e889fd | |
| parent | 2ac32e0f186ec0a2944d9738be3cac09f735f85d (diff) | |
| parent | fa3a8edf20c6e83524c125a156aa13d2bcd30165 (diff) | |
| download | python-novaclient-797ae2af69e35186a9bbbfbcb00a8bb52de6f630.tar.gz | |
Merge "Fix W503 line break before binary operator"
| -rw-r--r-- | novaclient/client.py | 6 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/fakes.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/novaclient/client.py b/novaclient/client.py index de85905a..00381524 100644 --- a/novaclient/client.py +++ b/novaclient/client.py @@ -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) diff --git a/novaclient/tests/unit/v2/fakes.py b/novaclient/tests/unit/v2/fakes.py index 69612c30..3da50491 100644 --- a/novaclient/tests/unit/v2/fakes.py +++ b/novaclient/tests/unit/v2/fakes.py @@ -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 ( |