From 6ccdbd3731df39544c245daa1c3acba9fedbd7a5 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 1 Feb 2021 10:47:54 +0000 Subject: Address nits from six removal patch Change-Id: Ia487c2961849a1d42eb72b2a69c360ea638f9d1b Signed-off-by: Stephen Finucane --- oslo_utils/dictutils.py | 4 ++-- oslo_utils/netutils.py | 3 +-- oslo_utils/reflection.py | 9 +++++---- oslo_utils/tests/test_reflection.py | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oslo_utils/dictutils.py b/oslo_utils/dictutils.py index 9185428..4e59b4c 100644 --- a/oslo_utils/dictutils.py +++ b/oslo_utils/dictutils.py @@ -20,10 +20,10 @@ def flatten_dict_to_keypairs(d, separator=':'): :param d: dictionaries which may be nested :param separator: symbol between names """ - for name, value in sorted(iter(d.items())): + for name, value in sorted(d.items()): if isinstance(value, dict): for subname, subvalue in flatten_dict_to_keypairs(value, separator): - yield ('%s%s%s' % (name, separator, subname), subvalue) + yield '%s%s%s' % (name, separator, subname), subvalue else: yield name, value diff --git a/oslo_utils/netutils.py b/oslo_utils/netutils.py index 492c726..ac3ab5c 100644 --- a/oslo_utils/netutils.py +++ b/oslo_utils/netutils.py @@ -283,8 +283,7 @@ def is_valid_mac(address): .. versionadded:: 3.17 """ m = "[0-9a-f]{2}(:[0-9a-f]{2}){5}$" - return (isinstance(address, str) and - re.match(m, address.lower())) + return isinstance(address, str) and re.match(m, address.lower()) def _is_int_in_range(value, start, end): diff --git a/oslo_utils/reflection.py b/oslo_utils/reflection.py index 8ef7c8d..042386e 100644 --- a/oslo_utils/reflection.py +++ b/oslo_utils/reflection.py @@ -223,8 +223,8 @@ def get_callable_args(function, required_only=False): are not included into output. """ sig = get_signature(function) - function_args = list(iter(sig.parameters.keys())) - for param_name, p in iter(sig.parameters.items()): + function_args = list(sig.parameters.keys()) + for param_name, p in sig.parameters.items(): if (p.kind in (Parameter.VAR_POSITIONAL, Parameter.VAR_KEYWORD) or (required_only and p.default is not Parameter.empty)): function_args.remove(param_name) @@ -234,5 +234,6 @@ def get_callable_args(function, required_only=False): def accepts_kwargs(function): """Returns ``True`` if function accepts kwargs otherwise ``False``.""" sig = get_signature(function) - return any(p.kind == Parameter.VAR_KEYWORD - for p in iter(sig.parameters.values())) + return any( + p.kind == Parameter.VAR_KEYWORD for p in sig.parameters.values() + ) diff --git a/oslo_utils/tests/test_reflection.py b/oslo_utils/tests/test_reflection.py index f104a87..880e3b8 100644 --- a/oslo_utils/tests/test_reflection.py +++ b/oslo_utils/tests/test_reflection.py @@ -22,8 +22,9 @@ from oslotest import base as test_base from oslo_utils import reflection -RUNTIME_ERROR_CLASSES = ['RuntimeError', 'Exception', - 'BaseException', 'object'] +RUNTIME_ERROR_CLASSES = [ + 'RuntimeError', 'Exception', 'BaseException', 'object', +] def dummy_decorator(f): @@ -187,8 +188,7 @@ class GetCallableNameTest(test_base.BaseTestCase): def test_static_method(self): name = reflection.get_callable_name(Class.static_method) - self.assertEqual('.'.join((__name__, 'Class', 'static_method')), - name) + self.assertEqual('.'.join((__name__, 'Class', 'static_method')), name) def test_class_method(self): name = reflection.get_callable_name(Class.class_method) -- cgit v1.2.1