Merge "Removes the use of mutables as default args"
This commit is contained in:
commit
9ee6b81cd1
@ -31,7 +31,8 @@ class AuthTokenMiddleware(auth_token.AuthProtocol):
|
|||||||
for public routes in the API.
|
for public routes in the API.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def __init__(self, app, conf, public_api_routes=[]):
|
def __init__(self, app, conf, public_api_routes=None):
|
||||||
|
api_routes = [] if public_api_routes is None else public_api_routes
|
||||||
self._ironic_app = app
|
self._ironic_app = app
|
||||||
# TODO(mrda): Remove .xml and ensure that doesn't result in a
|
# TODO(mrda): Remove .xml and ensure that doesn't result in a
|
||||||
# 401 Authentication Required instead of 404 Not Found
|
# 401 Authentication Required instead of 404 Not Found
|
||||||
@ -39,7 +40,7 @@ class AuthTokenMiddleware(auth_token.AuthProtocol):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
self.public_api_routes = [re.compile(route_pattern_tpl % route_tpl)
|
self.public_api_routes = [re.compile(route_pattern_tpl % route_tpl)
|
||||||
for route_tpl in public_api_routes]
|
for route_tpl in api_routes]
|
||||||
except re.error as e:
|
except re.error as e:
|
||||||
msg = _('Cannot compile public API routes: %s') % e
|
msg = _('Cannot compile public API routes: %s') % e
|
||||||
|
|
||||||
|
@ -116,7 +116,8 @@ class RPCService(service.Service):
|
|||||||
signal.signal(signal.SIGUSR1, self._handle_signal)
|
signal.signal(signal.SIGUSR1, self._handle_signal)
|
||||||
|
|
||||||
|
|
||||||
def prepare_service(argv=[]):
|
def prepare_service(argv=None):
|
||||||
|
argv = [] if argv is None else argv
|
||||||
log.register_options(CONF)
|
log.register_options(CONF)
|
||||||
log.set_defaults(default_log_levels=['amqp=WARNING',
|
log.set_defaults(default_log_levels=['amqp=WARNING',
|
||||||
'amqplib=WARNING',
|
'amqplib=WARNING',
|
||||||
|
@ -37,7 +37,9 @@ class TestACL(base.BaseApiTest):
|
|||||||
self.fake_db_node = db_utils.get_test_node(chassis_id=None)
|
self.fake_db_node = db_utils.get_test_node(chassis_id=None)
|
||||||
self.node_path = '/nodes/%s' % self.fake_db_node['uuid']
|
self.node_path = '/nodes/%s' % self.fake_db_node['uuid']
|
||||||
|
|
||||||
def get_json(self, path, expect_errors=False, headers=None, q=[], **param):
|
def get_json(self, path, expect_errors=False, headers=None, q=None,
|
||||||
|
**param):
|
||||||
|
q = [] if q is None else q
|
||||||
return super(TestACL, self).get_json(path,
|
return super(TestACL, self).get_json(path,
|
||||||
expect_errors=expect_errors,
|
expect_errors=expect_errors,
|
||||||
headers=headers,
|
headers=headers,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user