Clean up W503 and E402 pep8 errors

pycodestyle 2.40 and later enforce these rules that were not previously
enforced. Rather than just skipping them, this cleans up the trivial
instances of these violations.

This does also include some other updates that were not triggering errors
in an attempt to keep some of the style consistent.

Change-Id: Id7c0a6b8f1f835e69d844b000e3ed751852ada63
Closes-bug: #1762803

Author: stmcginnis

openstackclient/__init__.py

@@ -11,10 +11,10 @@
 #   under the License.
 #
 
-__all__ = ['__version__']
-
 import pbr.version
 
+__all__ = ['__version__']
+
 version_info = pbr.version.VersionInfo('python-openstackclient')
 try:
     __version__ = version_info.version_string()

openstackclient/common/extension.py

@@ -75,8 +75,10 @@ def take_action(self, parsed_args):
         # by default we want to show everything, unless the
         # user specifies one or more of the APIs to show
         # for now, only identity and compute are supported.
-        show_all = (not parsed_args.identity and not parsed_args.compute
-                    and not parsed_args.volume and not parsed_args.network)
+        show_all = (not parsed_args.identity and
+                    not parsed_args.compute and
+                    not parsed_args.volume and
+                    not parsed_args.network)
 
         if parsed_args.identity or show_all:
             identity_client = self.app.client_manager.identity

openstackclient/identity/v3/role.py

@@ -126,8 +126,8 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.user and not parsed_args.domain
-                and not parsed_args.group and not parsed_args.project):
+        if (not parsed_args.user and not parsed_args.domain and
+                not parsed_args.group and not parsed_args.project):
             msg = _("Role not added, incorrect set of arguments "
                     "provided. See openstack --help for more details")
             raise exceptions.CommandError(msg)
@@ -399,8 +399,8 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.user and not parsed_args.domain
-                and not parsed_args.group and not parsed_args.project):
+        if (not parsed_args.user and not parsed_args.domain and
+                not parsed_args.group and not parsed_args.project):
             msg = _("Incorrect set of arguments provided. "
                     "See openstack --help for more details")
             raise exceptions.CommandError(msg)

openstackclient/image/v1/image.py

@@ -21,11 +21,6 @@
 import os
 import sys
 
-if os.name == "nt":
-    import msvcrt
-else:
-    msvcrt = None
-
 from glanceclient.common import utils as gc_utils
 from osc_lib.cli import parseractions
 from osc_lib.command import command
@@ -35,6 +30,11 @@
 from openstackclient.api import utils as api_utils
 from openstackclient.i18n import _
 
+if os.name == "nt":
+    import msvcrt
+else:
+    msvcrt = None
+
 
 CONTAINER_CHOICES = ["ami", "ari", "aki", "bare", "docker", "ova", "ovf"]
 DEFAULT_CONTAINER_FORMAT = 'bare'

openstackclient/network/v2/router.py

@@ -86,8 +86,8 @@ def _get_attrs(client_manager, parsed_args):
         attrs['distributed'] = False
     if parsed_args.distributed:
         attrs['distributed'] = True
-    if ('availability_zone_hints' in parsed_args
-            and parsed_args.availability_zone_hints is not None):
+    if ('availability_zone_hints' in parsed_args and
+            parsed_args.availability_zone_hints is not None):
         attrs['availability_zone_hints'] = parsed_args.availability_zone_hints
     if parsed_args.description is not None:
         attrs['description'] = parsed_args.description

openstackclient/tests/functional/network/v2/test_network.py

@@ -209,7 +209,7 @@ def test_network_delete_network(self):
             cmd_output["description"],
         )
 
-        del_output = self.openstack('network delete ' + name1 + ' ' + name2)
+        del_output = self.openstack('network delete %s %s' % (name1, name2))
         self.assertOutput('', del_output)
 
     def test_network_list(self):
@@ -224,7 +224,7 @@ def test_network_list(self):
             network_options +
             name1
         ))
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
         self.assertIsNotNone(cmd_output["id"])
         if self.haz_network:
             self.assertEqual(
@@ -264,10 +264,8 @@ def test_network_list(self):
         else:
             network_options = '--subnet 4.5.6.7/28 '
         cmd_output = json.loads(self.openstack(
-            'network create -f json ' +
-            '--share ' +
-            network_options +
-            name2
+            'network create -f json --share %s%s' %
+            (network_options, name2)
         ))
         self.addCleanup(self.openstack, 'network delete ' + name2)
         self.assertIsNotNone(cmd_output["id"])
@@ -313,8 +311,7 @@ def test_network_list(self):
         # Test list --long
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--long"
+                "network list -f json --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -323,9 +320,7 @@ def test_network_list(self):
         # Test list --long --enable
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--enable " +
-                "--long"
+                "network list -f json --enable --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -334,9 +329,7 @@ def test_network_list(self):
         # Test list --long --disable
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--disable " +
-                "--long"
+                "network list -f json --disable --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertNotIn(name1, col_name)
@@ -345,8 +338,7 @@ def test_network_list(self):
         # Test list --share
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--share "
+                "network list -f json --share "
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertNotIn(name1, col_name)
@@ -355,8 +347,7 @@ def test_network_list(self):
         # Test list --no-share
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--no-share "
+                "network list -f json --no-share "
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -368,12 +359,10 @@ def test_network_dhcp_agent(self):
 
         name1 = uuid.uuid4().hex
         cmd_output1 = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            name1
+            'network create -f json --description aaaa %s' % name1
         ))
 
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
         network_id = cmd_output1['id']
@@ -386,20 +375,19 @@ def test_network_dhcp_agent(self):
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent add network --dhcp %s %s' % (agent_id, network_id)
         )
 
         # Test network list --agent
         cmd_output3 = json.loads(self.openstack(
-            'network list -f json --agent ' + agent_id
+            'network list -f json --agent %s' % agent_id
         ))
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent remove network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Assert
@@ -415,16 +403,16 @@ def test_network_set(self):
 
         name = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            '--enable ' +
-            '--no-share ' +
-            '--internal ' +
-            '--no-default ' +
-            '--enable-port-security ' +
+            'network create -f json '
+            '--description aaaa '
+            '--enable '
+            '--no-share '
+            '--internal '
+            '--no-default '
+            '--enable-port-security %s' %
             name
         ))
-        self.addCleanup(self.openstack, 'network delete ' + name)
+        self.addCleanup(self.openstack, 'network delete %s' % name)
         self.assertIsNotNone(cmd_output["id"])
         self.assertEqual(
             'aaaa',
@@ -453,12 +441,12 @@ def test_network_set(self):
         )
 
         raw_output = self.openstack(
-            'network set ' +
-            '--description cccc ' +
-            '--disable ' +
-            '--share ' +
-            '--external ' +
-            '--disable-port-security ' +
+            'network set '
+            '--description cccc '
+            '--disable '
+            '--share '
+            '--external '
+            '--disable-port-security %s' %
             name
         )
         self.assertOutput('', raw_output)

openstackclient/tests/functional/network/v2/test_network_agent.py

@@ -42,8 +42,7 @@ def test_network_agent_list_show_set(self):
 
         # agent show
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             agent_ids[0],
@@ -52,31 +51,25 @@ def test_network_agent_list_show_set(self):
 
         # agent set
         raw_output = self.openstack(
-            'network agent set ' +
-            '--disable ' +
-            agent_ids[0]
+            'network agent set --disable %s' % agent_ids[0]
         )
         self.assertOutput('', raw_output)
 
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             "DOWN",
             cmd_output['admin_state_up'],
         )
 
         raw_output = self.openstack(
-            'network agent set ' +
-            '--enable ' +
-            agent_ids[0]
+            'network agent set --enable %s' % agent_ids[0]
         )
         self.assertOutput('', raw_output)
 
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             "UP",
@@ -98,12 +91,10 @@ def test_network_dhcp_agent_list(self):
 
         name1 = uuid.uuid4().hex
         cmd_output1 = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            name1
+            'network create -f json --description aaaa %s' % name1
         ))
 
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
         network_id = cmd_output1['id']
@@ -116,20 +107,20 @@ def test_network_dhcp_agent_list(self):
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent add network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Test network agent list --network
         cmd_output3 = json.loads(self.openstack(
-            'network agent list -f json --network ' + network_id
+            'network agent list -f json --network %s' % network_id
         ))
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent remove network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Assert
@@ -142,9 +133,9 @@ def test_network_agent_list_routers(self):
         """Add agent to router, list agents on router, delete."""
         name = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
-            'router create -f json ' + name))
+            'router create -f json %s' % name))
 
-        self.addCleanup(self.openstack, 'router delete ' + name)
+        self.addCleanup(self.openstack, 'router delete %s' % name)
         # Get router ID
         router_id = cmd_output['id']
         # Get l3 agent id
@@ -157,19 +148,19 @@ def test_network_agent_list_routers(self):
 
         # Add router to agent
         self.openstack(
-            'network agent add router --l3 ' + agent_id + ' ' + router_id)
+            'network agent add router --l3 %s %s' % (agent_id, router_id))
 
         # Test router list --agent
         cmd_output = json.loads(self.openstack(
-            'network agent list -f json --router ' + router_id))
+            'network agent list -f json --router %s' % router_id))
 
         agent_ids = [x['ID'] for x in cmd_output]
         self.assertIn(agent_id, agent_ids)
 
         # Remove router from agent
         self.openstack(
-            'network agent remove router --l3 ' + agent_id + ' ' + router_id)
+            'network agent remove router --l3 %s %s' % (agent_id, router_id))
         cmd_output = json.loads(self.openstack(
-            'network agent list -f json --router ' + router_id))
+            'network agent list -f json --router %s' % router_id))
         agent_ids = [x['ID'] for x in cmd_output]
         self.assertNotIn(agent_id, agent_ids)

openstackclient/tests/functional/network/v2/test_network_flavor.py

@@ -39,13 +39,13 @@ def test_network_flavor_add_remove_profile(self):
         # Create Service Flavor
         cmd_output2 = json.loads(self.openstack(
             'network flavor profile create -f json --description '
-            + 'fakedescription' + ' --enable --metainfo ' + 'Extrainfo'
+            'fakedescription --enable --metainfo Extrainfo'
         ))
         service_profile_id = cmd_output2.get('id')
 
-        self.addCleanup(self.openstack, 'network flavor delete ' +
+        self.addCleanup(self.openstack, 'network flavor delete %s' %
                         flavor_id)
-        self.addCleanup(self.openstack, 'network flavor profile delete ' +
+        self.addCleanup(self.openstack, 'network flavor profile delete %s' %
                         service_profile_id)
         # Add flavor to service profile
         self.openstack(