resolving cmci variable lint errors

Signed-off-by: Andrew Twydell <[email protected]>

Author: AndrewTwydell

.ansible-lint

@@ -7,3 +7,4 @@ skip_list:
     - "galaxy[no-changelog]"
     - "meta-unsupported-ansible"
     - "meta-runtime[unsupported-version]"
+    - "var-naming[no-role-prefix]"

plugins/module_utils/cmci.py

@@ -8,13 +8,16 @@
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib,\
     env_fallback
-from typing import Optional, Dict, Any, List
+from typing import Optional, Dict, Any, List, Tuple
 from collections import OrderedDict
 from sys import version_info
 import re
 import traceback
 import urllib
 
+REQUESTS_IMP_ERR = ""
+XMLTODICT_IMP_ERR = ""
+
 try:
     import requests
 except ImportError:
@@ -178,7 +181,7 @@ def read_error_node(node):  # type: (OrderedDict) -> List[OrderedDict]
 
 
 def read_error_detail(key, value):
-    # type: (List[str, OrderedDict]) -> Tuple[str, List[OrderedDict]]
+    # type: (str, OrderedDict) -> Tuple[str, List[OrderedDict]]
     # Xmltodict parses inner error types as Dicts when there is only one item in
     # it even though it may well be a list if multiple results were returned. If
     # we find a dict here, wrap it in a list so we can account for only one

tests/unit/modules/test_cmci_action.py

@@ -14,7 +14,7 @@
 )
 
 
-def test_csd_install(cmci_module):  # type: (CMCITestHelper) -> None
+def test_csd_install(cmci_module):  # type: (cmci_module) -> None
     record = dict(
         name='bar',
         bundledir='/u/bundles/bloop',

tests/unit/modules/test_cmci_create.py

@@ -13,7 +13,7 @@
 )
 
 
-def test_csd_create(cmci_module):  # type: (CMCITestHelper) -> None
+def test_csd_create(cmci_module):  # type: (cmci_module) -> None
     record = OrderedDict({})
     record['csdgroup'] = 'bat'
     record['name'] = 'bar'

tests/unit/modules/test_cmci_delete.py

@@ -12,7 +12,7 @@
 )
 
 
-def test_delete_context(cmci_module):  # type: (CMCITestHelper) -> None
+def test_delete_context(cmci_module):  # type: (cmci_module) -> None
     cmci_module.stub_delete('cicsdefinitionbundle', 1)
 
     cmci_module.expect(

tests/unit/modules/test_cmci_filters.py

@@ -19,7 +19,7 @@
     expected_type = 'type'
 
 
-def test_query_criteria(cmci_module):  # type: (CMCITestHelper) -> None
+def test_query_criteria(cmci_module):  # type: (cmci_module) -> None
     records = [{'name': 'bat', 'dsname': 'STEWF.BLOP.BLIP'}]
     cmci_module.stub_records('GET', 'cicslocalfile', records, scope=SCOPE, parameters='?CRITERIA=%28FOO%3D%27BAR%27%29')
 

tests/unit/modules/test_cmci_get.py

@@ -18,7 +18,7 @@
 import sys
 
 
-def test_401_fails(cmci_module):  # type: (CMCITestHelper) -> None
+def test_401_fails(cmci_module):  # type: (cmci_module) -> None
     cmci_module.stub_request(
         'GET',
         'https://winmvs2c.hursley.ibm.com:26040/CICSSystemManagement/CICSDefinitionBundle/CICPY012/',

tests/unit/modules/test_cmci_update.py

@@ -12,7 +12,7 @@
 )
 
 
-def test_csd_update(cmci_module):  # type: (CMCITestHelper) -> None
+def test_csd_update(cmci_module):  # type: (cmci_module) -> None
     record = dict(
         changeagent='CSDAPI',
         changeagrel='0730',