PEP 8 indent cleanup. (#20800)

* PEP 8 E121 cleanup.

* PEP 8 E126 cleanup.

* PEP 8 E122 cleanup.

docs/api/conf.py

@@ -230,17 +230,17 @@ htmlhelp_basename = 'Ansibledoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
+    # The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
+    # The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
+    # Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    #'preamble': '',
 
-# Latex figure (float) alignment
+    # Latex figure (float) alignment
-#'figure_align': 'htbp',
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

lib/ansible/modules/packaging/os/rhn_channel.py

@@ -135,7 +135,7 @@ def main():
             user = dict(required=True),
             password = dict(required=True, aliases=['pwd']),
         )
-#        supports_check_mode=True
+        #        supports_check_mode=True
     )
 
     state = module.params['state']

lib/ansible/plugins/callback/dense.py

@@ -167,9 +167,9 @@ class CallbackModule_dense(CallbackModule_default):
 
             # Attributes to remove from results for more density
             self.removed_attributes = (
-#                'changed',
+                #                'changed',
                 'delta',
-#                'diff',
+                #                'diff',
                 'end',
                 'failed',
                 'failed_when_result',

test/sanity/pep8/legacy-files.txt

@@ -1,29 +1,17 @@
 contrib/inventory/abiquo.py
-contrib/inventory/azure_rm.py
-contrib/inventory/cloudstack.py
 contrib/inventory/consul_io.py
 contrib/inventory/digital_ocean.py
 contrib/inventory/docker.py
 contrib/inventory/ec2.py
-contrib/inventory/gce.py
 contrib/inventory/mdt_dynamic_inventory.py
 contrib/inventory/openvz.py
 contrib/inventory/rax.py
 contrib/inventory/softlayer.py
-contrib/inventory/ssh_config.py
 contrib/inventory/vbox.py
 contrib/inventory/zone.py
-docs/api/conf.py
-docs/docsite/conf.py
-docs/docsite/rst/conf.py
-docs/docsite/rst/dev_guide/conf.py
-examples/scripts/uptime.py
 hacking/metadata-tool.py
 hacking/module_formatter.py
-hacking/tests/gen_distribution_version_testcase.py
 lib/ansible/cli/__init__.py
-lib/ansible/cli/adhoc.py
-lib/ansible/cli/console.py
 lib/ansible/cli/galaxy.py
 lib/ansible/cli/playbook.py
 lib/ansible/compat/six/__init__.py
@@ -42,11 +30,8 @@ lib/ansible/module_utils/ec2.py
 lib/ansible/module_utils/eos.py
 lib/ansible/module_utils/f5.py
 lib/ansible/module_utils/facts.py
-lib/ansible/module_utils/gcp.py
 lib/ansible/module_utils/known_hosts.py
 lib/ansible/module_utils/mysql.py
-lib/ansible/module_utils/nxos.py
-lib/ansible/module_utils/redhat.py
 lib/ansible/module_utils/vmware.py
 lib/ansible/modules/cloud/amazon/_ec2_vpc.py
 lib/ansible/modules/cloud/amazon/aws_kms.py
@@ -58,19 +43,15 @@ lib/ansible/modules/cloud/amazon/cloudwatchevent_rule.py
 lib/ansible/modules/cloud/amazon/dynamodb_table.py
 lib/ansible/modules/cloud/amazon/ec2.py
 lib/ansible/modules/cloud/amazon/ec2_ami.py
-lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
 lib/ansible/modules/cloud/amazon/ec2_ami_find.py
 lib/ansible/modules/cloud/amazon/ec2_asg.py
 lib/ansible/modules/cloud/amazon/ec2_asg_facts.py
 lib/ansible/modules/cloud/amazon/ec2_customer_gateway.py
 lib/ansible/modules/cloud/amazon/ec2_elb.py
-lib/ansible/modules/cloud/amazon/ec2_elb_facts.py
 lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
 lib/ansible/modules/cloud/amazon/ec2_eni.py
 lib/ansible/modules/cloud/amazon/ec2_eni_facts.py
-lib/ansible/modules/cloud/amazon/ec2_facts.py
 lib/ansible/modules/cloud/amazon/ec2_group.py
-lib/ansible/modules/cloud/amazon/ec2_key.py
 lib/ansible/modules/cloud/amazon/ec2_lc.py
 lib/ansible/modules/cloud/amazon/ec2_lc_facts.py
 lib/ansible/modules/cloud/amazon/ec2_metric_alarm.py
@@ -87,7 +68,6 @@ lib/ansible/modules/cloud/amazon/ec2_vpc_net.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_net_facts.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_route_table_facts.py
-lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_subnet_facts.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py
 lib/ansible/modules/cloud/amazon/ec2_vpc_vgw_facts.py
@@ -97,7 +77,6 @@ lib/ansible/modules/cloud/amazon/ecs_service_facts.py
 lib/ansible/modules/cloud/amazon/ecs_task.py
 lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
 lib/ansible/modules/cloud/amazon/elasticache.py
-lib/ansible/modules/cloud/amazon/elasticache_subnet_group.py
 lib/ansible/modules/cloud/amazon/iam.py
 lib/ansible/modules/cloud/amazon/iam_cert.py
 lib/ansible/modules/cloud/amazon/iam_policy.py
@@ -109,7 +88,6 @@ lib/ansible/modules/cloud/amazon/rds_subnet_group.py
 lib/ansible/modules/cloud/amazon/redshift.py
 lib/ansible/modules/cloud/amazon/route53.py
 lib/ansible/modules/cloud/amazon/route53_health_check.py
-lib/ansible/modules/cloud/amazon/route53_zone.py
 lib/ansible/modules/cloud/amazon/s3.py
 lib/ansible/modules/cloud/amazon/s3_bucket.py
 lib/ansible/modules/cloud/amazon/s3_lifecycle.py
@@ -118,8 +96,6 @@ lib/ansible/modules/cloud/amazon/s3_website.py
 lib/ansible/modules/cloud/amazon/sns_topic.py
 lib/ansible/modules/cloud/amazon/sts_assume_role.py
 lib/ansible/modules/cloud/amazon/sts_session_token.py
-lib/ansible/modules/cloud/atomic/atomic_host.py
-lib/ansible/modules/cloud/atomic/atomic_image.py
 lib/ansible/modules/cloud/azure/azure.py
 lib/ansible/modules/cloud/azure/azure_rm_deployment.py
 lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py
@@ -135,46 +111,26 @@ lib/ansible/modules/cloud/cloudstack/cs_host.py
 lib/ansible/modules/cloud/cloudstack/cs_instance.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
 lib/ansible/modules/cloud/cloudstack/cs_sshkeypair.py
 lib/ansible/modules/cloud/digital_ocean/digital_ocean.py
 lib/ansible/modules/cloud/docker/_docker.py
-lib/ansible/modules/cloud/docker/docker_container.py
 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/gce_img.py
-lib/ansible/modules/cloud/google/gce_lb.py
-lib/ansible/modules/cloud/google/gce_mig.py
 lib/ansible/modules/cloud/google/gce_net.py
-lib/ansible/modules/cloud/google/gce_pd.py
 lib/ansible/modules/cloud/google/gce_tag.py
 lib/ansible/modules/cloud/google/gcpubsub.py
 lib/ansible/modules/cloud/google/gcpubsub_facts.py
-lib/ansible/modules/cloud/linode/linode.py
 lib/ansible/modules/cloud/misc/ovirt.py
 lib/ansible/modules/cloud/misc/proxmox.py
 lib/ansible/modules/cloud/misc/proxmox_kvm.py
 lib/ansible/modules/cloud/misc/proxmox_template.py
 lib/ansible/modules/cloud/misc/serverless.py
-lib/ansible/modules/cloud/misc/virt.py
 lib/ansible/modules/cloud/misc/xenserver_facts.py
-lib/ansible/modules/cloud/openstack/_glance_image.py
-lib/ansible/modules/cloud/openstack/_keystone_user.py
 lib/ansible/modules/cloud/openstack/_nova_compute.py
-lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py
-lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py
-lib/ansible/modules/cloud/openstack/_quantum_network.py
-lib/ansible/modules/cloud/openstack/_quantum_router.py
-lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py
-lib/ansible/modules/cloud/openstack/_quantum_router_interface.py
-lib/ansible/modules/cloud/openstack/_quantum_subnet.py
-lib/ansible/modules/cloud/openstack/os_auth.py
 lib/ansible/modules/cloud/openstack/os_nova_host_aggregate.py
 lib/ansible/modules/cloud/openstack/os_object.py
-lib/ansible/modules/cloud/openstack/os_quota.py
-lib/ansible/modules/cloud/openstack/os_recordset.py
-lib/ansible/modules/cloud/openstack/os_zone.py
 lib/ansible/modules/cloud/packet/packet_device.py
 lib/ansible/modules/cloud/packet/packet_sshkey.py
 lib/ansible/modules/cloud/profitbricks/profitbricks.py
@@ -182,7 +138,6 @@ lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py
 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/vsphere_guest.py
 lib/ansible/modules/cloud/webfaction/webfaction_app.py
 lib/ansible/modules/cloud/webfaction/webfaction_db.py
@@ -190,17 +145,11 @@ lib/ansible/modules/cloud/webfaction/webfaction_domain.py
 lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py
 lib/ansible/modules/cloud/webfaction/webfaction_site.py
 lib/ansible/modules/clustering/consul.py
-lib/ansible/modules/clustering/consul_acl.py
-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_publickey.py
 lib/ansible/modules/database/influxdb/influxdb_retention_policy.py
 lib/ansible/modules/database/misc/mongodb_parameter.py
 lib/ansible/modules/database/misc/mongodb_user.py
-lib/ansible/modules/database/misc/redis.py
-lib/ansible/modules/database/misc/riak.py
 lib/ansible/modules/database/mssql/mssql_db.py
 lib/ansible/modules/database/mysql/mysql_db.py
 lib/ansible/modules/database/mysql/mysql_replication.py
@@ -219,25 +168,17 @@ lib/ansible/modules/files/archive.py
 lib/ansible/modules/files/copy.py
 lib/ansible/modules/files/find.py
 lib/ansible/modules/files/ini_file.py
-lib/ansible/modules/files/lineinfile.py
-lib/ansible/modules/files/stat.py
 lib/ansible/modules/files/synchronize.py
 lib/ansible/modules/files/tempfile.py
 lib/ansible/modules/files/unarchive.py
-lib/ansible/modules/messaging/rabbitmq_binding.py
-lib/ansible/modules/messaging/rabbitmq_exchange.py
 lib/ansible/modules/messaging/rabbitmq_queue.py
 lib/ansible/modules/monitoring/boundary_meter.py
 lib/ansible/modules/monitoring/datadog_monitor.py
 lib/ansible/modules/monitoring/librato_annotation.py
 lib/ansible/modules/monitoring/logicmonitor.py
-lib/ansible/modules/monitoring/logicmonitor_facts.py
 lib/ansible/modules/monitoring/nagios.py
-lib/ansible/modules/monitoring/pagerduty.py
 lib/ansible/modules/monitoring/pagerduty_alert.py
-lib/ansible/modules/monitoring/pingdom.py
 lib/ansible/modules/monitoring/sensu_check.py
-lib/ansible/modules/monitoring/statusio_maintenance.py
 lib/ansible/modules/monitoring/zabbix_screen.py
 lib/ansible/modules/network/a10/a10_server.py
 lib/ansible/modules/network/a10/a10_server_axapi3.py
@@ -321,28 +262,20 @@ lib/ansible/modules/network/snmp_facts.py
 lib/ansible/modules/notification/hall.py
 lib/ansible/modules/notification/sendgrid.py
 lib/ansible/modules/notification/sns.py
-lib/ansible/modules/packaging/language/bundler.py
 lib/ansible/modules/packaging/language/composer.py
 lib/ansible/modules/packaging/language/cpanm.py
 lib/ansible/modules/packaging/language/maven_artifact.py
 lib/ansible/modules/packaging/os/apt.py
 lib/ansible/modules/packaging/os/apt_key.py
-lib/ansible/modules/packaging/os/apt_rpm.py
 lib/ansible/modules/packaging/os/dnf.py
 lib/ansible/modules/packaging/os/dpkg_selections.py
 lib/ansible/modules/packaging/os/homebrew.py
 lib/ansible/modules/packaging/os/openbsd_pkg.py
 lib/ansible/modules/packaging/os/opkg.py
 lib/ansible/modules/packaging/os/pacman.py
-lib/ansible/modules/packaging/os/pkgin.py
-lib/ansible/modules/packaging/os/pkgng.py
-lib/ansible/modules/packaging/os/portinstall.py
 lib/ansible/modules/packaging/os/redhat_subscription.py
-lib/ansible/modules/packaging/os/rhn_channel.py
 lib/ansible/modules/packaging/os/rhn_register.py
-lib/ansible/modules/packaging/os/rpm_key.py
 lib/ansible/modules/packaging/os/swdepot.py
-lib/ansible/modules/packaging/os/urpmi.py
 lib/ansible/modules/packaging/os/yum.py
 lib/ansible/modules/packaging/os/zypper.py
 lib/ansible/modules/remote_management/foreman/katello.py
@@ -357,21 +290,15 @@ lib/ansible/modules/storage/netapp/netapp_e_snapshot_group.py
 lib/ansible/modules/storage/netapp/netapp_e_snapshot_volume.py
 lib/ansible/modules/storage/netapp/netapp_e_storage_system.py
 lib/ansible/modules/storage/netapp/netapp_e_storagepool.py
-lib/ansible/modules/system/authorized_key.py
-lib/ansible/modules/system/cron.py
 lib/ansible/modules/system/debconf.py
 lib/ansible/modules/system/filesystem.py
 lib/ansible/modules/system/firewalld.py
-lib/ansible/modules/system/gconftool2.py
 lib/ansible/modules/system/gluster_volume.py
 lib/ansible/modules/system/group.py
 lib/ansible/modules/system/known_hosts.py
 lib/ansible/modules/system/locale_gen.py
 lib/ansible/modules/system/lvol.py
-lib/ansible/modules/system/openwrt_init.py
 lib/ansible/modules/system/pam_limits.py
-lib/ansible/modules/system/sefcontext.py
-lib/ansible/modules/system/seport.py
 lib/ansible/modules/system/solaris_zone.py
 lib/ansible/modules/system/systemd.py
 lib/ansible/modules/system/ufw.py
@@ -384,12 +311,10 @@ lib/ansible/modules/utilities/logic/pause.py
 lib/ansible/modules/utilities/logic/set_fact.py
 lib/ansible/modules/utilities/logic/wait_for.py
 lib/ansible/modules/web_infrastructure/apache2_mod_proxy.py
-lib/ansible/modules/web_infrastructure/apache2_module.py
 lib/ansible/modules/web_infrastructure/django_manage.py
 lib/ansible/modules/web_infrastructure/jenkins_job.py
 lib/ansible/modules/web_infrastructure/jira.py
 lib/ansible/modules/web_infrastructure/nginx_status_facts.py
-lib/ansible/modules/web_infrastructure/taiga_issue.py
 lib/ansible/modules/windows/win_acl.py
 lib/ansible/modules/windows/win_acl_inheritance.py
 lib/ansible/modules/windows/win_chocolatey.py
@@ -411,7 +336,6 @@ lib/ansible/modules/windows/win_webpicmd.py
 lib/ansible/parsing/mod_args.py
 lib/ansible/playbook/attribute.py
 lib/ansible/playbook/block.py
-lib/ansible/playbook/helpers.py
 lib/ansible/playbook/play_context.py
 lib/ansible/playbook/playbook_include.py
 lib/ansible/playbook/role/__init__.py
@@ -423,14 +347,10 @@ lib/ansible/plugins/action/async.py
 lib/ansible/plugins/action/set_fact.py
 lib/ansible/plugins/action/set_stats.py
 lib/ansible/plugins/action/synchronize.py
-lib/ansible/plugins/action/template.py
 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/logentries.py
 lib/ansible/plugins/callback/oneline.py
-lib/ansible/plugins/callback/selective.py
 lib/ansible/plugins/connection/accelerate.py
 lib/ansible/plugins/connection/paramiko_ssh.py
 lib/ansible/plugins/connection/ssh.py
@@ -466,26 +386,9 @@ test/units/errors/test_errors.py
 test/units/executor/test_playbook_executor.py
 test/units/mock/yaml_helper.py
 test/units/module_utils/basic/test__log_invocation.py
-test/units/module_utils/basic/test_exit_json.py
-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/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/parsing/test_mod_args.py
 test/units/parsing/yaml/test_loader.py
-test/units/playbook/test_block.py
 test/units/playbook/test_helpers.py
 test/units/playbook/test_play_context.py
-test/units/playbook/test_task.py
-test/units/plugins/lookup/test_ini.py
-test/units/plugins/lookup/test_password.py
-test/units/template/test_templar.py
-test/units/template/test_template_utilities.py
-test/units/utils/test_vars.py
-test/units/vars/test_variable_manager.py

test/sanity/pep8/legacy-ignore.txt

@@ -1,9 +1,6 @@
 E111
 E114
-E121
-E122
 E125
-E126
 E129
 E501
 E712

test/units/module_utils/test_distribution_version.py

@@ -54,7 +54,7 @@ TESTSETS = [
             "os_family": "RedHat",
             "distribution_version": "7.2.1511"
             }
-},
+        },
     {
         "name": "CentOS 6.7",
         "platform.dist": [
@@ -74,7 +74,7 @@ TESTSETS = [
             "os_family": "RedHat",
             "distribution_version": "6.7"
             }
-},
+        },
     {
         "name": "RedHat 7.2",
         "platform.dist": [
@@ -94,8 +94,8 @@ TESTSETS = [
             "os_family": "RedHat",
             "distribution_version": "7.2"
             }
-},
+        },
-{
+    {
         "name": "RedHat 6.7",
         "platform.dist": [
             "redhat",
@@ -114,8 +114,8 @@ TESTSETS = [
             "os_family": "RedHat",
             "distribution_version": "6.7"
             }
-},
+        },
-{
+    {
         "name" : "openSUSE Leap 42.1",
         "input": {
             "/etc/os-release":
@@ -604,7 +604,7 @@ DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
         "platform.system": "SunOS"
     },
 
-{
+    {
         "name": "Solaris 11.3",
         "platform.dist": [
             "",
@@ -621,9 +621,9 @@ DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
             "os_family": "Solaris",
             "distribution_version": "11.3"
             }
-},
+        },
 
-{
+    {
         "name": "Solaris 10",
         "platform.dist": [
             "",
@@ -640,9 +640,9 @@ DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
             "os_family": "Solaris",
             "distribution_version": "10"
             }
-},
+        },
 
-{
+    {
         "name": "Fedora 22",
         "platform.dist": [
             "fedora",
@@ -661,8 +661,8 @@ DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
             "os_family": "RedHat",
             "distribution_version": "22"
             }
-},
+        },
-{
+    {
         "platform.dist": [
             "fedora",
             "25",
@@ -681,7 +681,7 @@ DISTRIB_DESCRIPTION="CoreOS 976.0.0 (Coeur Rouge)"
             "os_family": "RedHat",
             "distribution_version": "25"
             }
-},
+        },
 
 
 ]