diff --git a/tox.ini b/tox.ini index c64b088..5f2f7fd 100644 --- a/tox.ini +++ b/tox.ini @@ -29,8 +29,7 @@ downloadcache = ~/cache/pip # H302 - ignored because it interferes more than it helps, and uses # suspect methods in its implementation anyway. # H405 multi line docstring summary not separated with an empty line -# H904 Wrap long lines in parentheses instead of a backslash [flake8] -ignore = H302,H405,H904 +ignore = H302,H405 show-source = True exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build diff --git a/tuskarclient/common/utils.py b/tuskarclient/common/utils.py index b2c7310..fe59756 100644 --- a/tuskarclient/common/utils.py +++ b/tuskarclient/common/utils.py @@ -87,12 +87,12 @@ def find_resource(manager, name_or_id): num_matches = len(matches) if num_matches == 0: - msg = "No %s with name '%s' exists." % \ - (manager.resource_class.__name__.lower(), name_or_id) + msg = "No %s with name '%s' exists." % ( + manager.resource_class.__name__.lower(), name_or_id) raise exc.CommandError(msg) elif num_matches > 1: - msg = "Multiple instances of %s with name '%s' exist." % \ - (manager.resource_class.__name__.lower(), name_or_id) + msg = "Multiple instances of %s with name '%s' exist." % ( + manager.resource_class.__name__.lower(), name_or_id) raise exc.CommandError(msg) return matches[0] diff --git a/tuskarclient/shell.py b/tuskarclient/shell.py index 3cce017..264323e 100755 --- a/tuskarclient/shell.py +++ b/tuskarclient/shell.py @@ -45,17 +45,17 @@ class TuskarShell(object): def _prepare_parsers(self): nonversioned_parser = self._nonversioned_parser() - self.partial_args =\ - nonversioned_parser.parse_known_args(self.raw_args)[0] - self.parser, self.subparsers =\ - self._parser(self.partial_args.tuskar_api_version) + self.partial_args = ( + nonversioned_parser.parse_known_args(self.raw_args)[0]) + self.parser, self.subparsers = ( + self._parser(self.partial_args.tuskar_api_version)) def run(self): '''Run the CLI. Parse arguments and do the respective action.''' # run self.do_help() if we have no raw_args at all or just -h/--help - if not self.raw_args\ - or self.raw_args in (['-h'], ['--help']): + if (not self.raw_args + or self.raw_args in (['-h'], ['--help'])): self.do_help(self.partial_args) return 0 diff --git a/tuskarclient/tests/test_client.py b/tuskarclient/tests/test_client.py index a04bcf7..a172879 100644 --- a/tuskarclient/tests/test_client.py +++ b/tuskarclient/tests/test_client.py @@ -356,8 +356,8 @@ class ClientClientTest(tutils.TestCase): 'any_other_key': 'any_other_value', } mocked_client_class = mock.MagicMock() - mocked_import_versioned_module.return_value.Client = \ - mocked_client_class + mocked_import_versioned_module.return_value.Client = ( + mocked_client_class) client.Client(api_version, *args, **kwargs) mocked_import_versioned_module.assert_called_with( api_version, diff --git a/tuskarclient/tests/test_http.py b/tuskarclient/tests/test_http.py index fb17970..a423739 100644 --- a/tuskarclient/tests/test_http.py +++ b/tuskarclient/tests/test_http.py @@ -81,10 +81,8 @@ class HttpClientRawRequestTest(tutils.TestCase): self.client.raw_request(provided_method, provided_url, **provided_args) - self.client._http_request.\ - assert_called_once_with(expected_url, - expected_method, - **expected_args) + self.client._http_request.assert_called_once_with( + expected_url, expected_method, **expected_args) def test_raw_request_set_default_headers_with_empty_kwargs(self): args = self.call_args.copy() diff --git a/tuskarclient/tests/utils.py b/tuskarclient/tests/utils.py index d46b7ff..1489934 100644 --- a/tuskarclient/tests/utils.py +++ b/tuskarclient/tests/utils.py @@ -175,8 +175,8 @@ class CommandOutputMissingMismatch(object): self.out_inc = out_inc def describe(self): - return "%s '%s' should contain '%s'"\ - % (self.type, self.out, self.out_inc) + return "%s '%s' should contain '%s'" % ( + self.type, self.out, self.out_inc) def get_details(self): return {} @@ -192,8 +192,8 @@ class CommandOutputExtraMismatch(object): self.out_exc = out_exc def describe(self): - return "%s '%s' should not contain '%s'"\ - % (self.type, self.out, self.out_exc) + return "%s '%s' should not contain '%s'" % ( + self.type, self.out, self.out_exc) def get_details(self): return {} @@ -205,8 +205,8 @@ class CommandOutputReturnCodeMismatch(object): self.ret_exp = ret_exp def describe(self): - return "Return code is '%s' but expected '%s'"\ - % (self.ret, self.ret_exp) + return "Return code is '%s' but expected '%s'" % ( + self.ret, self.ret_exp) def get_details(self): return {} diff --git a/tuskarclient/tests/v1/test_overclouds_shell.py b/tuskarclient/tests/v1/test_overclouds_shell.py index e011843..d8e8e8b 100644 --- a/tuskarclient/tests/v1/test_overclouds_shell.py +++ b/tuskarclient/tests/v1/test_overclouds_shell.py @@ -195,8 +195,9 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest): @mock.patch('tuskarclient.v1.overclouds_shell.print_overcloud_detail') def test_create_roles(self, mock_print_detail): self.args.roles = ['foo=10'] - self.tuskar.overcloud_roles.list.return_value =\ - [OvercloudRole(None, {'name': 'foo', 'id': 1})] + self.tuskar.overcloud_roles.list.return_value = [ + OvercloudRole(None, {'name': 'foo', 'id': 1}) + ] self.create(self.tuskar, self.args, outfile=self.outfile) self.tuskar.overclouds.create.assert_called_with( @@ -212,8 +213,9 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest): @mock.patch('tuskarclient.v1.overclouds_shell.print_overcloud_detail') def test_create_roles_duplicate(self, mock_print_detail): self.args.roles = ['foo=10', 'foo=20'] - self.tuskar.overcloud_roles.list.return_value =\ - [OvercloudRole(None, {'name': 'foo', 'id': 1})] + self.tuskar.overcloud_roles.list.return_value = [ + OvercloudRole(None, {'name': 'foo', 'id': 1}) + ] self.assertRaises( exceptions.ValidationError, @@ -225,8 +227,9 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest): @mock.patch('tuskarclient.v1.overclouds_shell.print_overcloud_detail') def test_create_roles_invalid_structure(self, mock_print_detail): self.args.roles = ['foo=10', '120'] - self.tuskar.overcloud_roles.list.return_value =\ - [OvercloudRole(None, {'name': 'foo', 'id': 1})] + self.tuskar.overcloud_roles.list.return_value = [ + OvercloudRole(None, {'name': 'foo', 'id': 1}) + ] self.assertRaises( exceptions.CommandError, @@ -238,8 +241,9 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest): @mock.patch('tuskarclient.v1.overclouds_shell.print_overcloud_detail') def test_create_roles_multiple_equals(self, mock_print_detail): self.args.roles = ['foo=foo=0'] - self.tuskar.overcloud_roles.list.return_value =\ - [OvercloudRole(None, {'name': 'foo', 'id': 1})] + self.tuskar.overcloud_roles.list.return_value = [ + OvercloudRole(None, {'name': 'foo', 'id': 1}) + ] self.assertRaises( ValueError, @@ -251,8 +255,9 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest): @mock.patch('tuskarclient.v1.overclouds_shell.print_overcloud_detail') def test_create_roles_with_id(self, mock_print_detail): self.args.roles = ['12345=10'] - self.tuskar.overcloud_roles.list.return_value =\ - [OvercloudRole(None, {'name': 'foo', 'id': 1})] + self.tuskar.overcloud_roles.list.return_value = [ + OvercloudRole(None, {'name': 'foo', 'id': 1}) + ] self.create(self.tuskar, self.args, outfile=self.outfile) self.tuskar.overclouds.create.assert_called_with(