Merge "Bandit test results"

This commit is contained in:
Jenkins 2016-04-07 22:07:44 +00:00 committed by Gerrit Code Review
commit fcb99249a4
3 changed files with 6 additions and 6 deletions

View File

@ -296,7 +296,7 @@ class Catalog(catalog.CatalogDriverV8):
url = formatted_url
else:
continue
except exception.MalformedEndpoint:
except exception.MalformedEndpoint: # nosec(tkelsey)
continue # this failure is already logged in format_url()
region = endpoint['region_id']
@ -358,7 +358,7 @@ class Catalog(catalog.CatalogDriverV8):
endpoint['url'] = formatted_url
else:
continue
except exception.MalformedEndpoint:
except exception.MalformedEndpoint: # nosec(tkelsey)
# this failure is already logged in format_url()
continue

View File

@ -236,7 +236,7 @@ class Catalog(core.Driver):
silent_keyerror_failures=silent_keyerror_failures)
if formatted_value:
service_data[k] = formatted_value
except exception.MalformedEndpoint:
except exception.MalformedEndpoint: # nosec(tkelsey)
continue # this failure is already logged in format_url()
catalog[region][service] = service_data

View File

@ -170,7 +170,7 @@ class Token(token.persistence.TokenDriverV8):
for item in token_list:
try:
item_id, expires = self._format_token_index_item(item)
except (ValueError, TypeError):
except (ValueError, TypeError): # nosec(tkelsey)
# NOTE(morganfainberg): Skip on expected errors
# possibilities from the `_format_token_index_item` method.
continue
@ -334,7 +334,7 @@ class Token(token.persistence.TokenDriverV8):
for item in token_list:
try:
token_id, expires = self._format_token_index_item(item)
except (TypeError, ValueError):
except (TypeError, ValueError): # nosec(tkelsey)
# NOTE(morganfainberg): Skip on expected error possibilities
# from the `_format_token_index_item` method.
continue
@ -344,7 +344,7 @@ class Token(token.persistence.TokenDriverV8):
try:
token_ref = self.get_token(token_id)
except exception.TokenNotFound:
except exception.TokenNotFound: # nosec(tkelsey)
# NOTE(morganfainberg): Token doesn't exist, skip it.
continue
if token_ref: