Some lambda were replaced on def
Always use a def statement instead of an assignment statement that binds a lambda expression directly to an identifier. Yes: def f(x): return 2*x No: f = lambda x: 2*x https://www.python.org/dev/peps/pep-0008/ Change-Id: I776b80bb4bc2184125f461c801897f84d3f29254
This commit is contained in:
parent
5a5c7005be
commit
1bb37b6857
|
@ -140,7 +140,10 @@ class ResourcePages(compat.Directive):
|
||||||
if not prop:
|
if not prop:
|
||||||
return 'Value'
|
return 'Value'
|
||||||
if prop.type == properties.Schema.LIST:
|
if prop.type == properties.Schema.LIST:
|
||||||
schema = lambda i: prop.schema[i] if prop.schema else None
|
|
||||||
|
def schema(i):
|
||||||
|
return prop.schema[i] if prop.schema else None
|
||||||
|
|
||||||
sub_type = [self._prop_syntax_example(schema(i))
|
sub_type = [self._prop_syntax_example(schema(i))
|
||||||
for i in range(2)]
|
for i in range(2)]
|
||||||
return '[%s, %s, ...]' % tuple(sub_type)
|
return '[%s, %s, ...]' % tuple(sub_type)
|
||||||
|
|
|
@ -79,7 +79,9 @@ def extract_param_list(params, prefix=''):
|
||||||
yield (index, (key, value))
|
yield (index, (key, value))
|
||||||
|
|
||||||
# Sort and group by index
|
# Sort and group by index
|
||||||
key_func = lambda d: d[0]
|
def key_func(d):
|
||||||
|
return d[0]
|
||||||
|
|
||||||
data = sorted(get_param_data(params), key=key_func)
|
data = sorted(get_param_data(params), key=key_func)
|
||||||
members = itertools.groupby(data, key_func)
|
members = itertools.groupby(data, key_func)
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,9 @@ summary_keys = [
|
||||||
|
|
||||||
|
|
||||||
def format_event(req, event, keys=None):
|
def format_event(req, event, keys=None):
|
||||||
include_key = lambda k: k in keys if keys else True
|
|
||||||
|
def include_key(k):
|
||||||
|
return k in keys if keys else True
|
||||||
|
|
||||||
def transform(key, value):
|
def transform(key, value):
|
||||||
if not include_key(key):
|
if not include_key(key):
|
||||||
|
@ -132,7 +134,9 @@ class EventController(object):
|
||||||
events = self._event_list(req, identity,
|
events = self._event_list(req, identity,
|
||||||
filters=filter_params, **params)
|
filters=filter_params, **params)
|
||||||
else:
|
else:
|
||||||
res_match = lambda e: e[rpc_api.EVENT_RES_NAME] == resource_name
|
|
||||||
|
def res_match(e):
|
||||||
|
return e[rpc_api.EVENT_RES_NAME] == resource_name
|
||||||
|
|
||||||
events = self._event_list(req, identity, res_match,
|
events = self._event_list(req, identity, res_match,
|
||||||
filters=filter_params, **params)
|
filters=filter_params, **params)
|
||||||
|
|
|
@ -27,7 +27,9 @@ from heat.rpc import client as rpc_client
|
||||||
|
|
||||||
def format_resource(req, res, keys=None):
|
def format_resource(req, res, keys=None):
|
||||||
keys = keys or []
|
keys = keys or []
|
||||||
include_key = lambda k: k in keys if keys else True
|
|
||||||
|
def include_key(k):
|
||||||
|
return k in keys if keys else True
|
||||||
|
|
||||||
def transform(key, value):
|
def transform(key, value):
|
||||||
if not include_key(key):
|
if not include_key(key):
|
||||||
|
|
|
@ -31,7 +31,10 @@ def _to_byte_string(value, num_bits):
|
||||||
required.
|
required.
|
||||||
"""
|
"""
|
||||||
shifts = six.moves.xrange(num_bits - 8, -8, -8)
|
shifts = six.moves.xrange(num_bits - 8, -8, -8)
|
||||||
byte_at = lambda off: (value >> off if off >= 0 else value << -off) & 0xff
|
|
||||||
|
def byte_at(off):
|
||||||
|
return (value >> off if off >= 0 else value << -off) & 0xff
|
||||||
|
|
||||||
return ''.join(six.unichr(byte_at(offset)) for offset in shifts)
|
return ''.join(six.unichr(byte_at(offset)) for offset in shifts)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -56,8 +56,13 @@ def get_facade():
|
||||||
|
|
||||||
return _facade
|
return _facade
|
||||||
|
|
||||||
get_engine = lambda: get_facade().get_engine()
|
|
||||||
get_session = lambda: get_facade().get_session()
|
def get_engine():
|
||||||
|
return get_facade().get_engine()
|
||||||
|
|
||||||
|
|
||||||
|
def get_session():
|
||||||
|
return get_facade().get_session()
|
||||||
|
|
||||||
|
|
||||||
def get_backend():
|
def get_backend():
|
||||||
|
|
|
@ -464,7 +464,10 @@ class ResourceGroup(stack_resource.StackResource):
|
||||||
|
|
||||||
def _handle_repl_val(self, res_name, val):
|
def _handle_repl_val(self, res_name, val):
|
||||||
repl_var = self.properties[self.INDEX_VAR]
|
repl_var = self.properties[self.INDEX_VAR]
|
||||||
recurse = lambda x: self._handle_repl_val(res_name, x)
|
|
||||||
|
def recurse(x):
|
||||||
|
return self._handle_repl_val(res_name, x)
|
||||||
|
|
||||||
if isinstance(val, six.string_types):
|
if isinstance(val, six.string_types):
|
||||||
return val.replace(repl_var, res_name)
|
return val.replace(repl_var, res_name)
|
||||||
elif isinstance(val, collections.Mapping):
|
elif isinstance(val, collections.Mapping):
|
||||||
|
|
|
@ -423,5 +423,8 @@ class DependencyTaskGroup(object):
|
||||||
|
|
||||||
Subtasks have been started but have not yet completed.
|
Subtasks have been started but have not yet completed.
|
||||||
"""
|
"""
|
||||||
running = lambda k_r: k_r[0] in self._graph and k_r[1].started()
|
|
||||||
|
def running(k_r):
|
||||||
|
return k_r[0] in self._graph and k_r[1].started()
|
||||||
|
|
||||||
return six.moves.filter(running, six.iteritems(self._runners))
|
return six.moves.filter(running, six.iteritems(self._runners))
|
||||||
|
|
|
@ -891,10 +891,11 @@ class EngineService(service.Service):
|
||||||
|
|
||||||
actions = update_task.preview()
|
actions = update_task.preview()
|
||||||
|
|
||||||
fmt_updated_res = lambda k: api.format_stack_resource(
|
def fmt_updated_res(k):
|
||||||
updated_stack.resources.get(k))
|
return api.format_stack_resource(updated_stack.resources.get(k))
|
||||||
fmt_current_res = lambda k: api.format_stack_resource(
|
|
||||||
current_stack.resources.get(k))
|
def fmt_current_res(k):
|
||||||
|
return api.format_stack_resource(current_stack.resources.get(k))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'unchanged': map(fmt_updated_res, actions['unchanged']),
|
'unchanged': map(fmt_updated_res, actions['unchanged']),
|
||||||
|
|
|
@ -162,7 +162,9 @@ class dependenciesTest(common.HeatTestCase):
|
||||||
|
|
||||||
def test_noexist_partial(self):
|
def test_noexist_partial(self):
|
||||||
d = dependencies.Dependencies([('foo', 'bar')])
|
d = dependencies.Dependencies([('foo', 'bar')])
|
||||||
get = lambda i: d[i]
|
|
||||||
|
def get(i):
|
||||||
|
return d[i]
|
||||||
self.assertRaises(KeyError, get, 'baz')
|
self.assertRaises(KeyError, get, 'baz')
|
||||||
|
|
||||||
def test_single_partial(self):
|
def test_single_partial(self):
|
||||||
|
|
|
@ -1011,7 +1011,10 @@ class PropertiesTest(common.HeatTestCase):
|
||||||
'bad_int': 'foo',
|
'bad_int': 'foo',
|
||||||
'default_override': 21,
|
'default_override': 21,
|
||||||
}
|
}
|
||||||
double = lambda d: d * 2
|
|
||||||
|
def double(d):
|
||||||
|
return d * 2
|
||||||
|
|
||||||
self.props = properties.Properties(schema, data, double, 'wibble')
|
self.props = properties.Properties(schema, data, double, 'wibble')
|
||||||
|
|
||||||
def test_integer_good(self):
|
def test_integer_good(self):
|
||||||
|
|
|
@ -1083,7 +1083,10 @@ class TemplateFnErrorTest(common.HeatTestCase):
|
||||||
|
|
||||||
def test_bad_input(self):
|
def test_bad_input(self):
|
||||||
tmpl = template.Template(empty_template)
|
tmpl = template.Template(empty_template)
|
||||||
resolve = lambda s: TemplateTest.resolve(s, tmpl)
|
|
||||||
|
def resolve(s):
|
||||||
|
return TemplateTest.resolve(s, tmpl)
|
||||||
|
|
||||||
error = self.assertRaises(self.expect,
|
error = self.assertRaises(self.expect,
|
||||||
resolve,
|
resolve,
|
||||||
self.snippet)
|
self.snippet)
|
||||||
|
|
|
@ -38,8 +38,7 @@ class UUIDStub(object):
|
||||||
|
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
self.uuid4 = uuid.uuid4
|
self.uuid4 = uuid.uuid4
|
||||||
uuid_stub = lambda: self.value
|
uuid.uuid4 = lambda: self.value
|
||||||
uuid.uuid4 = uuid_stub
|
|
||||||
|
|
||||||
def __exit__(self, *exc_info):
|
def __exit__(self, *exc_info):
|
||||||
uuid.uuid4 = self.uuid4
|
uuid.uuid4 = self.uuid4
|
||||||
|
|
Loading…
Reference in New Issue