PEP 8 whitespace cleanup. (#20783)

* PEP 8 E271 whitespace cleanup.
* PEP 8 W293 whitespace cleanup.
* Fix whitespace issue from recent PR.

test/integration/cleanup_ec2.py

@@ -75,10 +75,10 @@ def prompt_and_delete(item, prompt, assumeyes):
         assumeyes = raw_input(prompt).lower() == 'y'
     assert hasattr(item, 'delete') or hasattr(item, 'terminate') , "Class <%s> has no delete or terminate attribute" % item.__class__
     if assumeyes:
-        if  hasattr(item, 'delete'):
+        if hasattr(item, 'delete'):
             item.delete()
             print ("Deleted %s" % item)
-        if  hasattr(item, 'terminate'):
+        if hasattr(item, 'terminate'):
             item.terminate()
             print ("Terminated %s" % item)
 

test/sanity/pep8/legacy-files.txt

@@ -6,7 +6,6 @@ contrib/inventory/consul_io.py
 contrib/inventory/digital_ocean.py
 contrib/inventory/docker.py
 contrib/inventory/ec2.py
-contrib/inventory/fleet.py
 contrib/inventory/freeipa.py
 contrib/inventory/gce.py
 contrib/inventory/linode.py
@@ -16,7 +15,6 @@ contrib/inventory/rax.py
 contrib/inventory/softlayer.py
 contrib/inventory/spacewalk.py
 contrib/inventory/ssh_config.py
-contrib/inventory/stacki.py
 contrib/inventory/vbox.py
 contrib/inventory/vmware_inventory.py
 contrib/inventory/windows_azure.py
@@ -27,7 +25,6 @@ docs/docsite/conf.py
 docs/docsite/rst/conf.py
 docs/docsite/rst/dev_guide/conf.py
 examples/scripts/uptime.py
-hacking/dump_playbook_attributes.py
 hacking/metadata-tool.py
 hacking/module_formatter.py
 hacking/tests/gen_distribution_version_testcase.py
@@ -142,16 +139,13 @@ lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py
 lib/ansible/modules/cloud/azure/azure_rm_networkinterface_facts.py
 lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py
 lib/ansible/modules/cloud/azure/azure_rm_securitygroup_facts.py
-lib/ansible/modules/cloud/azure/azure_rm_storageblob.py
 lib/ansible/modules/cloud/azure/azure_rm_subnet.py
 lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py
-lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py
 lib/ansible/modules/cloud/centurylink/clc_loadbalancer.py
 lib/ansible/modules/cloud/cloudscale/cloudscale_server.py
 lib/ansible/modules/cloud/cloudstack/cs_firewall.py
 lib/ansible/modules/cloud/cloudstack/cs_host.py
 lib/ansible/modules/cloud/cloudstack/cs_instance.py
-lib/ansible/modules/cloud/cloudstack/cs_instance_facts.py
 lib/ansible/modules/cloud/cloudstack/cs_iso.py
 lib/ansible/modules/cloud/cloudstack/cs_portforward.py
 lib/ansible/modules/cloud/cloudstack/cs_securitygroup_rule.py
@@ -163,7 +157,6 @@ lib/ansible/modules/cloud/docker/docker_image.py
 lib/ansible/modules/cloud/docker/docker_service.py
 lib/ansible/modules/cloud/google/gc_storage.py
 lib/ansible/modules/cloud/google/gcdns_record.py
-lib/ansible/modules/cloud/google/gcdns_zone.py
 lib/ansible/modules/cloud/google/gce_img.py
 lib/ansible/modules/cloud/google/gce_lb.py
 lib/ansible/modules/cloud/google/gce_mig.py
@@ -212,7 +205,6 @@ lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py
 lib/ansible/modules/cloud/rackspace/rax_cbs.py
 lib/ansible/modules/cloud/rackspace/rax_cbs_attachments.py
 lib/ansible/modules/cloud/rackspace/rax_clb.py
-lib/ansible/modules/cloud/rackspace/rax_facts.py
 lib/ansible/modules/cloud/rackspace/rax_identity.py
 lib/ansible/modules/cloud/rackspace/rax_network.py
 lib/ansible/modules/cloud/rackspace/rax_queue.py
@@ -220,7 +212,6 @@ lib/ansible/modules/cloud/softlayer/sl_vm.py
 lib/ansible/modules/cloud/vmware/vca_fw.py
 lib/ansible/modules/cloud/vmware/vmware_guest.py
 lib/ansible/modules/cloud/vmware/vmware_local_user_manager.py
-lib/ansible/modules/cloud/vmware/vmware_vswitch.py
 lib/ansible/modules/cloud/vmware/vsphere_copy.py
 lib/ansible/modules/cloud/vmware/vsphere_guest.py
 lib/ansible/modules/cloud/webfaction/webfaction_app.py
@@ -234,10 +225,8 @@ lib/ansible/modules/clustering/consul_kv.py
 lib/ansible/modules/clustering/consul_session.py
 lib/ansible/modules/commands/command.py
 lib/ansible/modules/commands/script.py
-lib/ansible/modules/crypto/openssl_privatekey.py
 lib/ansible/modules/crypto/openssl_publickey.py
 lib/ansible/modules/database/influxdb/influxdb_retention_policy.py
-lib/ansible/modules/database/misc/elasticsearch_plugin.py
 lib/ansible/modules/database/misc/kibana_plugin.py
 lib/ansible/modules/database/misc/mongodb_parameter.py
 lib/ansible/modules/database/misc/mongodb_user.py
@@ -254,7 +243,6 @@ lib/ansible/modules/database/postgresql/postgresql_lang.py
 lib/ansible/modules/database/postgresql/postgresql_privs.py
 lib/ansible/modules/database/postgresql/postgresql_schema.py
 lib/ansible/modules/database/postgresql/postgresql_user.py
-lib/ansible/modules/database/vertica/vertica_configuration.py
 lib/ansible/modules/database/vertica/vertica_role.py
 lib/ansible/modules/database/vertica/vertica_schema.py
 lib/ansible/modules/database/vertica/vertica_user.py
@@ -280,7 +268,6 @@ lib/ansible/modules/monitoring/logicmonitor.py
 lib/ansible/modules/monitoring/logicmonitor_facts.py
 lib/ansible/modules/monitoring/monit.py
 lib/ansible/modules/monitoring/nagios.py
-lib/ansible/modules/monitoring/newrelic_deployment.py
 lib/ansible/modules/monitoring/pagerduty.py
 lib/ansible/modules/monitoring/pagerduty_alert.py
 lib/ansible/modules/monitoring/pingdom.py
@@ -297,7 +284,6 @@ lib/ansible/modules/network/a10/a10_virtual_server.py
 lib/ansible/modules/network/basics/get_url.py
 lib/ansible/modules/network/basics/slurp.py
 lib/ansible/modules/network/basics/uri.py
-lib/ansible/modules/network/bigswitch/bigmon_chain.py
 lib/ansible/modules/network/cloudengine/ce_command.py
 lib/ansible/modules/network/cloudflare_dns.py
 lib/ansible/modules/network/dellos10/dellos10_facts.py
@@ -307,7 +293,6 @@ lib/ansible/modules/network/dellos9/dellos9_config.py
 lib/ansible/modules/network/dellos9/dellos9_facts.py
 lib/ansible/modules/network/dnsimple.py
 lib/ansible/modules/network/dnsmadeeasy.py
-lib/ansible/modules/network/eos/eos_eapi.py
 lib/ansible/modules/network/exoscale/exo_dns_record.py
 lib/ansible/modules/network/f5/bigip_facts.py
 lib/ansible/modules/network/f5/bigip_monitor_tcp.py
@@ -382,7 +367,6 @@ lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
 lib/ansible/modules/network/ovs/openvswitch_port.py
 lib/ansible/modules/network/panos/panos_nat_policy.py
 lib/ansible/modules/network/snmp_facts.py
-lib/ansible/modules/network/wakeonlan.py
 lib/ansible/modules/notification/flowdock.py
 lib/ansible/modules/notification/hall.py
 lib/ansible/modules/notification/irc.py
@@ -507,13 +491,10 @@ lib/ansible/playbook/play_context.py
 lib/ansible/playbook/playbook_include.py
 lib/ansible/playbook/role/__init__.py
 lib/ansible/playbook/role/metadata.py
-lib/ansible/playbook/role_include.py
 lib/ansible/playbook/taggable.py
 lib/ansible/plugins/action/__init__.py
 lib/ansible/plugins/action/add_host.py
 lib/ansible/plugins/action/async.py
-lib/ansible/plugins/action/package.py
-lib/ansible/plugins/action/service.py
 lib/ansible/plugins/action/set_fact.py
 lib/ansible/plugins/action/set_stats.py
 lib/ansible/plugins/action/synchronize.py
@@ -522,14 +503,12 @@ lib/ansible/plugins/cache/jsonfile.py
 lib/ansible/plugins/callback/default.py
 lib/ansible/plugins/callback/dense.py
 lib/ansible/plugins/callback/foreman.py
-lib/ansible/plugins/callback/jabber.py
 lib/ansible/plugins/callback/logentries.py
 lib/ansible/plugins/callback/oneline.py
 lib/ansible/plugins/callback/profile_tasks.py
 lib/ansible/plugins/callback/selective.py
 lib/ansible/plugins/callback/syslog_json.py
 lib/ansible/plugins/connection/accelerate.py
-lib/ansible/plugins/connection/iocage.py
 lib/ansible/plugins/connection/paramiko_ssh.py
 lib/ansible/plugins/connection/ssh.py
 lib/ansible/plugins/connection/winrm.py
@@ -581,14 +560,12 @@ test/units/module_utils/basic/test_log.py
 test/units/module_utils/basic/test_no_log.py
 test/units/module_utils/basic/test_safe_eval.py
 test/units/module_utils/basic/test_set_mode_if_different.py
-test/units/module_utils/gcp/test_auth.py
 test/units/module_utils/json_utils/test_filter_non_json_lines.py
 test/units/module_utils/test_basic.py
 test/units/module_utils/test_distribution_version.py
 test/units/module_utils/test_facts.py
 test/units/module_utils/test_text.py
 test/units/modules/cloud/amazon/test_ec2_vpc_nat_gateway.py
-test/units/modules/cloud/google/test_gce_tag.py
 test/units/parsing/test_mod_args.py
 test/units/parsing/yaml/test_loader.py
 test/units/playbook/test_block.py
@@ -599,7 +576,6 @@ test/units/playbook/test_task.py
 test/units/plugins/action/test_raw.py
 test/units/plugins/action/test_synchronize.py
 test/units/plugins/lookup/test_ini.py
-test/units/plugins/lookup/test_lastpass.py
 test/units/plugins/lookup/test_password.py
 test/units/plugins/strategy/test_strategy_base.py
 test/units/template/test_templar.py

test/sanity/pep8/legacy-ignore.txt

@@ -8,7 +8,6 @@ E125
 E126
 E129
 E131
-E271
 E501
 E701
 E703
@@ -17,4 +16,3 @@ E712
 E721
 W191
 W291
-W293

test/units/cli/test_galaxy.py

@@ -120,7 +120,7 @@ class TestGalaxy(unittest.TestCase):
         with patch.object(ansible.cli.CLI, "execute", return_value=None) as mock_ex:
             with patch.object(ansible.cli.CLI, "run", return_value=None) as mock_run:
                 gc.run()
-                
+
                 # testing
                 self.assertEqual(mock_run.call_count, 1)
                 self.assertTrue(isinstance(gc.api, ansible.galaxy.api.GalaxyAPI))

test/units/module_utils/gcp/test_auth.py

@@ -135,7 +135,7 @@ class GCPAuthTestCase(unittest.TestCase):
                                                   require_valid_json=False,
                                                   check_libcloud=False)
             self.assertTrue(is_valid)
-        
+
     @mock.patch('ansible.module_utils.gcp._get_gcp_environ_var',
                 side_effect=fake_get_gcp_environ_var)
     def test_get_gcp_environment_credentials(self, mockobj):
@@ -144,7 +144,7 @@ class GCPAuthTestCase(unittest.TestCase):
         actual = _get_gcp_environment_credentials(None, None, None)
         expected = tuple(['gce-email', None, None])
         self.assertEqual(expected, actual)
-        
+
         fake_env_data = {'GCE_PEM_FILE_PATH': '/path/to/pem.pem'}
         expected = tuple([None, '/path/to/pem.pem', None])
         actual = _get_gcp_environment_credentials(None, None, None)

test/units/module_utils/test_basic.py

@@ -176,10 +176,10 @@ class TestModuleUtilsBasic(ModuleTestCase):
                         return ("Bar", "2", "Two")
                     else:
                         return ("", "", "")
-                
+
                 with patch('platform.linux_distribution', side_effect=_dist):
                     self.assertEqual(get_distribution(), "Bar")
-                
+
             with patch('platform.linux_distribution', side_effect=Exception("boo")):
                 with patch('platform.dist', return_value=("bar", "2", "Two")):
                     self.assertEqual(get_distribution(), "Bar")
@@ -699,7 +699,7 @@ class TestModuleUtilsBasic(ModuleTestCase):
                 self.assertRaises(SystemExit, am.set_context_if_different, '/path/to/file', ['foo_u', 'foo_r', 'foo_t', 's0'], True)
 
             am.is_special_selinux_path = MagicMock(return_value=(True, ['sp_u', 'sp_r', 'sp_t', 's0']))
-            
+
             with patch('selinux.lsetfilecon', return_value=0) as m:
                 self.assertEqual(am.set_context_if_different('/path/to/file', ['foo_u', 'foo_r', 'foo_t', 's0'], False), True)
                 m.assert_called_with('/path/to/file', 'sp_u:sp_r:sp_t:s0')

test/units/modules/cloud/google/test_gce_tag.py

@@ -52,7 +52,7 @@ class TestGCETag(unittest.TestCase):
         want = ['one']
         got = _get_changed_items(tags_to_add, existing_tags)
         self.assertEqual(want, got)
-        
+
         # simulate removing tags
         # specifying one tag on right that doesn't exist
         tags_to_remove = ['one', 'two']
@@ -63,6 +63,6 @@ class TestGCETag(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-    
 
-    
+
+

test/units/plugins/lookup/test_lastpass.py

@@ -114,12 +114,12 @@ class MockLPass(LPass):
 
 
 class DisconnectedMockLPass(MockLPass):
-    
+
     _mock_disconnected = True
 
 
 class LoggedOutMockLPass(MockLPass):
-    
+
     _mock_logged_out = True
 
 

test/units/plugins/strategy/test_strategy_base.py

@@ -163,7 +163,7 @@ class TestStrategyBase(unittest.TestCase):
         mock_tqm._failed_hosts = []
         mock_tqm._unreachable_hosts = []
         self.assertEqual(strategy_base.get_hosts_remaining(play=mock_play), mock_hosts)
-        
+
         mock_tqm._failed_hosts = ["host01"]
         self.assertEqual(strategy_base.get_hosts_remaining(play=mock_play), mock_hosts[1:])
         self.assertEqual(strategy_base.get_failed_hosts(play=mock_play), [mock_hosts[0]])
@@ -186,7 +186,7 @@ class TestStrategyBase(unittest.TestCase):
         mock_inventory = MagicMock()
         mock_options = MagicMock()
         mock_options.module_path = None
-        
+
         tqm = TaskQueueManager(
             inventory=mock_inventory,
             variable_manager=mock_var_manager,
@@ -210,7 +210,7 @@ class TestStrategyBase(unittest.TestCase):
             self.assertEqual(strategy_base._pending_results, 3)
         finally:
             tqm.cleanup()
-        
+
 
     def test_strategy_base_process_pending_results(self):
         mock_tqm = MagicMock()
@@ -240,7 +240,7 @@ class TestStrategyBase(unittest.TestCase):
 
         mock_tqm._stats = MagicMock()
         mock_tqm._stats.increment.return_value = None
-        
+
         mock_play = MagicMock()
 
         mock_host = MagicMock()

test/units/template/test_templar.py

@@ -103,7 +103,7 @@ class TestTemplar(unittest.TestCase):
     def test_template_jinja2_extensions(self):
         fake_loader = DictDataLoader({})
         templar = Templar(loader=fake_loader)
-        
+
         old_exts = C.DEFAULT_JINJA2_EXTENSIONS
         try:
             C.DEFAULT_JINJA2_EXTENSIONS = "foo,bar"