openstack/deb-python-keystoneclient
Code Issues Proposed changes

Merge "Prefer () to continue line per PEP8"

Browse Source
This commit is contained in:
Jenkins
2014-04-15 21:42:54 +00:00
committed by Gerrit Code Review
parent ca88561b09 337c389e73
commit 6395a5a5f3
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneclient/generic/client.py
View File

@@ -97,8 +97,8 @@ class Client(httpclient.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}
@@ -107,8 +107,8 @@ class Client(httpclient.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}

16
keystoneclient/middleware/auth_token.py
View File

@@ -488,13 +488,13 @@ class AuthProtocol(object):
self._cache_pool = None
self._cache_initialized = False
# memcache value treatment, ENCRYPT or MAC
self._memcache_security_strategy = \
self._conf_get('memcache_security_strategy')
self._memcache_security_strategy = (
self._conf_get('memcache_security_strategy'))
if self._memcache_security_strategy is not None:
self._memcache_security_strategy = \
self._memcache_security_strategy.upper()
self._memcache_secret_key = \
self._conf_get('memcache_secret_key')
self._memcache_security_strategy = (
self._memcache_security_strategy.upper())
self._memcache_secret_key = (
self._conf_get('memcache_secret_key'))
self._assert_valid_memcache_protection_config()
# By default the token will be cached for 5 minutes
self.token_cache_time = int(self._conf_get('token_cache_time'))
@@ -506,8 +506,8 @@ class AuthProtocol(object):
self.http_connect_timeout = (http_connect_timeout_cfg and
int(http_connect_timeout_cfg))
self.auth_version = None
self.http_request_max_retries = \
self._conf_get('http_request_max_retries')
self.http_request_max_retries = (
self._conf_get('http_request_max_retries'))
self.include_service_catalog = self._conf_get(
'include_service_catalog')

8
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -581,8 +581,8 @@ class CommonAuthTokenMiddlewareTest(object):
tmp_name = uuid.uuid4().hex
test_parent_signing_dir = "/tmp/%s" % tmp_name
self.middleware.signing_dirname = "/tmp/%s/%s" % ((tmp_name,) * 2)
self.middleware.signing_cert_file_name = "%s/test.pem" % \
self.middleware.signing_dirname
self.middleware.signing_cert_file_name = (
"%s/test.pem" % self.middleware.signing_dirname)
self.middleware.verify_signing_dir()
# NOTE(wu_wenxiang): Verify if the signing dir was created as expected.
self.assertTrue(os.path.isdir(self.middleware.signing_dirname))
@@ -1377,8 +1377,8 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
def test_request_prevent_service_catalog_injection(self):
req = webob.Request.blank('/')
req.headers['X-Service-Catalog'] = '[]'
req.headers['X-Auth-Token'] = \
self.examples.UUID_TOKEN_NO_SERVICE_CATALOG
req.headers['X-Auth-Token'] = (
self.examples.UUID_TOKEN_NO_SERVICE_CATALOG)
body = self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self.response_status, 200)
self.assertFalse(req.headers.get('X-Service-Catalog'))

8
keystoneclient/tests/v2_0/test_auth.py
View File

@@ -54,16 +54,16 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
@httpretty.activate
def test_authenticate_success_expired(self):
# Build an expired token
self.TEST_RESPONSE_DICT['access']['token']['expires'] = \
(timeutils.utcnow() - datetime.timedelta(1)).isoformat()
self.TEST_RESPONSE_DICT['access']['token']['expires'] = (
(timeutils.utcnow() - datetime.timedelta(1)).isoformat())
exp_resp = httpretty.Response(body=json.dumps(self.TEST_RESPONSE_DICT),
content_type='application/json')
# Build a new response
TEST_TOKEN = "abcdef"
self.TEST_RESPONSE_DICT['access']['token']['expires'] = \
'2020-01-01T00:00:10.000123Z'
self.TEST_RESPONSE_DICT['access']['token']['expires'] = (
'2020-01-01T00:00:10.000123Z')
self.TEST_RESPONSE_DICT['access']['token']['id'] = TEST_TOKEN
new_resp = httpretty.Response(body=json.dumps(self.TEST_RESPONSE_DICT),