Merge "Don't use mutable defaults in allow arguments"

This commit is contained in:
Jenkins 2017-08-24 18:49:16 +00:00 committed by Gerrit Code Review
commit ae66931463
3 changed files with 6 additions and 4 deletions

View File

@ -88,7 +88,7 @@ class Adapter(object):
def __init__(self, session, service_type=None, service_name=None,
interface=None, region_name=None, endpoint_override=None,
version=None, auth=None, user_agent=None,
connect_retries=None, logger=None, allow={},
connect_retries=None, logger=None, allow=None,
additional_headers=None, client_name=None,
client_version=None, allow_version_hack=None,
global_request_id=None,

View File

@ -156,7 +156,7 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
return False
def get_endpoint_data(self, session, service_type=None, interface=None,
region_name=None, service_name=None, allow={},
region_name=None, service_name=None, allow=None,
allow_version_hack=True, discover_versions=True,
skip_discovery=False, min_version=None,
max_version=None, endpoint_override=None, **kwargs):
@ -223,6 +223,8 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
:return: Valid EndpointData or None if not available.
:rtype: `keystoneauth1.discover.EndpointData` or None
"""
allow = allow or {}
min_version, max_version = discover._normalize_version_args(
None, min_version, max_version)
@ -302,7 +304,7 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
def get_endpoint(self, session, service_type=None, interface=None,
region_name=None, service_name=None, version=None,
allow={}, allow_version_hack=True,
allow=None, allow_version_hack=True,
skip_discovery=False,
min_version=None, max_version=None,
**kwargs):

View File

@ -466,7 +466,7 @@ class Session(object):
endpoint_filter=None, auth=None, requests_auth=None,
raise_exc=True, allow_reauth=True, log=True,
endpoint_override=None, connect_retries=0, logger=_logger,
allow={}, client_name=None, client_version=None,
allow=None, client_name=None, client_version=None,
microversion=None, microversion_service_type=None,
**kwargs):
"""Send an HTTP request with the specified characteristics.