fix(various): Remove unused imports for pylint testing

Makefile

@@ -56,7 +56,7 @@ old-sanity:		## Sanity tests for Ansible v2.9 and Ansible v2.10
 
 .PHONY: new-sanity
 new-sanity:		## Sanity tests for Ansible v2.11 and above
-	ansible-test sanity -v --skip-test pylint --python $(python_version)
+	ansible-test sanity -v --python $(python_version)
 
 .PHONY: reqs
 reqs:       ## Recreate the requirements.txt file

plugins/module_utils/panos.py

@@ -37,7 +37,7 @@
 import importlib
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.connection import Connection, ConnectionError
+from ansible.module_utils.connection import Connection
 
 _MIN_VERSION_ERROR = "{0} version ({1}) < minimum version ({2})"
 HAS_PANDEVICE = True

plugins/modules/panos_export.py

@@ -199,25 +199,21 @@
 )
 
 try:
-    from panos.errors import PanDeviceError
     from panos.panorama import Panorama
 except ImportError:
     try:
-        from pandevice.errors import PanDeviceError
         from pandevice.panorama import Panorama
     except ImportError:
         pass
 
 try:
-    import pan.xapi
     import xmltodict
 
     HAS_LIB = True
 except ImportError:
     HAS_LIB = False
 
 import json
-import os
 import pathlib
 import time
 import xml.etree.ElementTree as ET

plugins/modules/panos_facts.py

@@ -233,7 +233,6 @@
 
 try:
     from panos.device import Vsys
-    from panos.errors import PanDeviceError
     from panos.firewall import Firewall
     from panos.network import (
         AggregateInterface,
@@ -251,7 +250,6 @@
 except ImportError:
     try:
         from pandevice.device import Vsys
-        from pandevice.errors import PanDeviceError
         from pandevice.firewall import Firewall
         from pandevice.network import (
             AggregateInterface,

plugins/modules/panos_import.py

@@ -205,9 +205,7 @@
 )
 
 try:
-    import pan.xapi
     import requests
-    import requests_toolbelt
 
     HAS_LIB = True
 except ImportError:

plugins/modules/panos_object.py

@@ -256,16 +256,16 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try:
-    import panos
-    from panos.panorama import DeviceGroup
-    from panos import objects, panorama
+    from panos.panorama import DeviceGroup, Panorama
+    from panos.firewall import Firewall
+    from panos import objects
     from panos.base import PanDevice
     from panos.errors import PanDeviceError
 except ImportError:
     try:
-        import pandevice
-        from pandevice.panorama import DeviceGroup
-        from pandevice import objects, panorama
+        from pandevice.panorama import DeviceGroup, Panorama
+        from pandevice.firewall import Firewall
+        from pandevice import objects
         from pandevice.base import PanDevice
         from pandevice.errors import PanDeviceError
     except ImportError:
@@ -294,10 +294,10 @@ def get_devicegroup(device, devicegroup):
 def find_object(device, dev_group, obj_name, obj_type):
     # Get the firewall objects
     obj_type.refreshall(device)
-    if isinstance(device, pandevice.firewall.Firewall):
+    if isinstance(device, Firewall):
         addr = device.find(obj_name, obj_type)
         return addr
-    elif isinstance(device, pandevice.panorama.Panorama):
+    elif isinstance(device, Panorama):
         addr = device.find(obj_name, obj_type)
         if addr is None:
             if dev_group:

plugins/modules/panos_query_rules.py

@@ -147,11 +147,9 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try:
-    import panos
     from panos import base, firewall, objects, panorama, policies
 except ImportError:
     try:
-        import pandevice
         from pandevice import base, firewall, objects, panorama, policies
     except ImportError:
         pass
@@ -204,7 +202,7 @@ def get_object(device, dev_group, obj_name):
         return match
 
     # Search Panorama device group
-    if isinstance(device, pandevice.panorama.Panorama):
+    if isinstance(device, panorama.Panorama):
         # Search device group address objects
         match = dev_group.find(obj_name, objects.AddressObject)
         if match:
@@ -248,7 +246,7 @@ def get_services(device, dev_group, svc_list, obj_list):
             get_services(device, dev_group, global_grp_match.value, obj_list)
 
         # Search Panorama device group
-        if isinstance(device, pandevice.panorama.Panorama):
+        if isinstance(device, panorama.Panorama):
 
             # Search device group address objects
             dg_obj_match = dev_group.find(svc, objects.ServiceObject)

plugins/modules/panos_redistribution.py

@@ -136,22 +136,6 @@
     get_connection,
 )
 
-try:
-    from panos.network import (
-        RedistributionProfile,
-        RedistributionProfileIPv6,
-        VirtualRouter,
-    )
-except ImportError:
-    try:
-        from pandevice.network import (
-            RedistributionProfile,
-            RedistributionProfileIPv6,
-            VirtualRouter,
-        )
-    except ImportError:
-        pass
-
 
 class Helper(ConnectionHelper):
     def spec_handling(self, spec, module):

tests/unit/httpapi/test_panos.py

@@ -9,7 +9,6 @@
 from ansible.module_utils.basic import to_text
 from ansible.module_utils.six import BytesIO
 from ansible.module_utils.six.moves import urllib
-from ansible.module_utils.six.moves.urllib.error import HTTPError
 from ansible_collections.mrichardson03.panos.plugins.httpapi.panos import (
     HttpApi,
     PanOSAPIError,

tests/unit/plugins/module_utils/test_panos.py

@@ -17,12 +17,11 @@
 
 __metaclass__ = type
 
-from unittest.mock import MagicMock, Mock, PropertyMock, patch
+from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.paloaltonetworks.panos.plugins.module_utils.panos import (
-    ConnectionHelper,
     get_connection,
 )