additional lint fixes for flake8

Author: Bradley A. Thornton

roles/resource_module/templates/module_directory/network_os/network_os_facts.py.j2

@@ -11,7 +11,7 @@ from __future__ import absolute_import, division, print_function
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.connection import Connection
 from {{ import_path }}. \
-     {{ network_os }}.facts.facts import Facts
+    {{ network_os }}.facts.facts import Facts
 
 ANSIBLE_METADATA = {'metadata_version': '{{rm_ansible_metadata['metadata_version']}}',
                     'status': {{rm_ansible_metadata['status']}},

roles/resource_module/templates/module_directory/network_os/network_os_resource.py.j2

@@ -34,7 +34,7 @@ __metaclass__ = type  # pylint: disable=C0103
 # pylint: disable=C0413
 from ansible.module_utils.basic import AnsibleModule
 from {{ import_path }}. \
-     {{ network_os }}.config.{{ resource }}.{{ resource }} import {{ resource|capitalize }}
+    {{ network_os }}.config.{{ resource }}.{{ resource }} import {{ resource|capitalize }}
 # pylint: enable=C0413
 
 

roles/resource_module/templates/module_utils/network_os/config/resource/resource.py.j2

@@ -14,12 +14,12 @@ created
 from ansible.module_utils.network.common.utils import to_list
 
 from {{ import_path }}. \
-     {{ network_os }}.argspec.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Args
+    {{ network_os }}.argspec.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Args
 from {{ import_path }}. \
-     {{ network_os }}. \
-     config.base import ConfigBase
+    {{ network_os }}. \
+    config.base import ConfigBase
 from {{ import_path }}. \
-     {{ network_os }}.facts.facts import Facts
+    {{ network_os }}.facts.facts import Facts
 
 
 class {{ resource|capitalize }}(ConfigBase, {{ resource|capitalize }}Args):

roles/resource_module/templates/module_utils/network_os/facts/facts.py.j2

@@ -9,15 +9,15 @@ this file validates each subset of facts and selectively
 calls the appropriate facts gathering function
 """
 
-from ansible.module_utils.six import string_types, iteritems
+from ansible.module_utils.six import iteritems
 from {{ import_path }}. \
-     {{ network_os }}.argspec.facts.facts import FactsArgs
+    {{ network_os }}.argspec.facts.facts import FactsArgs
 from {{ import_path }}. \
-     {{ network_os }}.argspec.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Args
+    {{ network_os }}.argspec.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Args
 from {{ import_path }}. \
-     {{ network_os }}.facts.base import FactsBase
+    {{ network_os }}.facts.base import FactsBase
 from {{ import_path }}. \
-     {{ network_os }}.facts.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Facts
+    {{ network_os }}.facts.{{ resource }}.{{ resource }} import {{ resource|capitalize }}Facts
 
 
 FACT_SUBSETS = {}
@@ -56,8 +56,8 @@ class Facts(FactsArgs, FactsBase):  # pylint: disable=R0903
                     exclude_subsets.update(minimal_gather_subset)
                     continue
                 if subset == 'all':
-                    exclude_subsets.update(valid_subsets -
-                                           minimal_gather_subset)
+                    exclude_subsets.update(
+                        valid_subsets - minimal_gather_subset)
                     continue
                 exclude = True
             else:

roles/resource_module/templates/module_utils/network_os/facts/resource/resource.py.j2

@@ -12,7 +12,7 @@ based on the configuration.
 import re
 from copy import deepcopy
 from {{ import_path }}. \
-     {{ network_os }}.facts.base import FactsBase
+    {{ network_os }}.facts.base import FactsBase
 
 
 class {{ resource|capitalize }}Facts(FactsBase):

tests/roles/my_role/library/myos_facts.py

@@ -11,10 +11,10 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.connection import Connection
 from ansible.module_utils. \
-     myos.facts.facts import Facts
+    myos.facts.facts import Facts
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': [u'preview'],
+                    'status': ['preview'],
                     'supported_by': '<support_group>'}
 
 

tests/roles/my_role/library/myos_interfaces.py

@@ -182,7 +182,7 @@
 # pylint: disable=C0413
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils. \
-     myos.config.interfaces.interfaces import Interfaces
+    myos.config.interfaces.interfaces import Interfaces
 # pylint: enable=C0413
 
 

tests/roles/my_role/module_utils/myos/config/interfaces/interfaces.py

@@ -14,12 +14,12 @@
 from ansible.module_utils.network.common.utils import to_list
 
 from ansible.module_utils. \
-     myos.argspec.interfaces.interfaces import InterfacesArgs
+    myos.argspec.interfaces.interfaces import InterfacesArgs
 from ansible.module_utils. \
-     myos. \
-     config.base import ConfigBase
+    myos. \
+    config.base import ConfigBase
 from ansible.module_utils. \
-     myos.facts.facts import Facts
+    myos.facts.facts import Facts
 
 
 class Interfaces(ConfigBase, InterfacesArgs):

tests/roles/my_role/module_utils/myos/facts/facts.py

@@ -9,15 +9,15 @@
 calls the appropriate facts gathering function
 """
 
-from ansible.module_utils.six import string_types, iteritems
+from ansible.module_utils.six import iteritems
 from ansible.module_utils. \
-     myos.argspec.facts.facts import FactsArgs
+    myos.argspec.facts.facts import FactsArgs
 from ansible.module_utils. \
-     myos.argspec.interfaces.interfaces import InterfacesArgs
+    myos.argspec.interfaces.interfaces import InterfacesArgs
 from ansible.module_utils. \
-     myos.facts.base import FactsBase
+    myos.facts.base import FactsBase
 from ansible.module_utils. \
-     myos.facts.interfaces.interfaces import InterfacesFacts
+    myos.facts.interfaces.interfaces import InterfacesFacts
 
 
 FACT_SUBSETS = {}
@@ -56,8 +56,8 @@ def gen_runable(module, subsets, valid_subsets):
                     exclude_subsets.update(minimal_gather_subset)
                     continue
                 if subset == 'all':
-                    exclude_subsets.update(valid_subsets -
-                                           minimal_gather_subset)
+                    exclude_subsets.update(
+                        valid_subsets - minimal_gather_subset)
                     continue
                 exclude = True
             else:

tests/roles/my_role/module_utils/myos/facts/interfaces/interfaces.py

@@ -12,7 +12,7 @@
 import re
 from copy import deepcopy
 from ansible.module_utils. \
-     myos.facts.base import FactsBase
+    myos.facts.base import FactsBase
 
 
 class InterfacesFacts(FactsBase):