Fix differences with devel.

lib/ansible/modules/cloud/amazon/ec2_asg.py

@@ -78,7 +78,7 @@ options:
       - Number of instances you'd like to replace at a time.  Used with replace_all_instances.
     required: false
     version_added: "1.8"
-    default: 1  
+    default: 1
   replace_instances:
     description:
       - List of instance_ids belonging to the named ASG that you would like to terminate and be replaced with instances matching the current launch configuration.

lib/ansible/modules/cloud/amazon/ec2_eni_facts.py

@@ -92,7 +92,7 @@ def list_ec2_snapshots_boto3(connection, module):
 
 
 def get_eni_info(interface):
-    
+
     # Private addresses
     private_addresses = []
     for ip in interface.private_ip_addresses:
@@ -125,23 +125,23 @@ def get_eni_info(interface):
                                         'attach_time': interface.attachment.attach_time,
                                         'delete_on_termination': interface.attachment.delete_on_termination,
                                         }
-    
+
     return interface_info
-    
+
 
 def list_eni(connection, module):
-    
+
     filters = module.params.get("filters")
     interface_dict_array = []
-    
+
     try:
         all_eni = connection.get_all_network_interfaces(filters=filters)
     except BotoServerError as e:
         module.fail_json(msg=e.message)
-    
+
     for interface in all_eni:
         interface_dict_array.append(get_eni_info(interface))
-        
+
     module.exit_json(interfaces=interface_dict_array)
 
 
@@ -152,12 +152,12 @@ def main():
             filters = dict(default=None, type='dict')
         )
     )
-    
+
     module = AnsibleModule(argument_spec=argument_spec)
 
     if not HAS_BOTO:
         module.fail_json(msg='boto required for this module')
-    
+
     if HAS_BOTO3:
         region, ec2_url, aws_connect_params = get_aws_connection_info(module, boto3=True)
 

lib/ansible/modules/cloud/amazon/ec2_vpc_subnet_facts.py

@@ -144,4 +144,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

lib/ansible/modules/cloud/amazon/iam.py

@@ -101,7 +101,7 @@ options:
      - C(always) will update passwords if they differ.  C(on_create) will only set the password for newly created users.
 notes:
   - 'Currently boto does not support the removal of Managed Policies, the module will error out if your user/group/role has managed policies when you try to do state=absent. They will need to be removed manually.'
-author: 
+author:
     - "Jonathan I. Davila (@defionscode)"
     - "Paul Seiffert (@seiffert)"
 extends_documentation_fragment: aws

lib/ansible/modules/cloud/amazon/rds.py

@@ -224,7 +224,7 @@ options:
 requirements:
     - "python >= 2.6"
     - "boto"
-author: 
+author:
     - "Bruce Pennypacker (@bpennypacker)"
     - "Will Thames (@willthames)"
 extends_documentation_fragment:

lib/ansible/modules/cloud/amazon/route53.py

@@ -28,7 +28,7 @@ description:
 options:
   command:
     description:
-      - Specifies the action to take.  
+      - Specifies the action to take.
     required: true
     choices: [ 'get', 'create', 'delete' ]
   zone:

lib/ansible/modules/cloud/amazon/s3_logging.py

@@ -181,4 +181,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()