summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-07 11:42:02 +0900
committerMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-07 11:42:02 +0900
commit8decff01ad8ee7e8f7d4103a727321b162280cbe (patch)
tree8044185f17cc8cd0c099bc4ff2d203f86c991c0c
parent01051c71c8f405e9f40a088509d09f171aea1c7d (diff)
pep8 cleanup.
-rw-r--r--nova/auth/manager.py2
-rw-r--r--nova/utils.py11
2 files changed, 7 insertions, 6 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index b51cc7f4b..f1d4a1e39 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -315,7 +315,7 @@ class AuthManager(object):
LOG.debug('expected_signature: %s', expected_signature)
LOG.debug('signature: %s', signature)
if signature != expected_signature:
- secondary = utils.get_secondary_server_string(server_string)
+ secondary = utils.get_secondary_server_string(server_string)
if secondary is not '':
secondary_signature = signer.Signer(
user.secret.encode()).generate(params, verb,
diff --git a/nova/utils.py b/nova/utils.py
index 8fd464452..3e938247f 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -715,6 +715,7 @@ def check_isinstance(obj, cls):
# TODO(justinsb): Can we make this better??
return cls() # Ugly PyLint hack
+
def get_secondary_server_string(str):
"""Returns host part only of the given server_string if it's a combination
of host part and port. Otherwise, return null string."""
@@ -724,14 +725,14 @@ def get_secondary_server_string(str):
return ''
# Next, check if this is IPv6 address with port number combination.
- if str.find("]:") != -1:
+ if str.find("]:") != -1:
[address, sep, port] = str.replace('[', '', 1).partition(']:')
- return address
+ return address
# Third, check if this is a combination of general address and port
- if str.find(':') == -1:
- return ''
+ if str.find(':') == -1:
+ return ''
# This must be a combination of host part and port
[address, sep, port] = str.partition(':')
- return address
+ return address