Merge remote-tracking branch 'upstream/main' into pager-disable-fallback

.github/workflows/test.yml

@@ -5,7 +5,7 @@ concurrency:
   group: ${{ github.head_ref }}
   cancel-in-progress: true
 
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   pull_request:
     branches: [main]
   workflow_dispatch:

bindep.txt

@@ -2,11 +2,9 @@
 # see https://docs.openstack.org/infra/bindep/ for additional information.
 
 gcc-c++ [doc test platform:rpm]
-python3-devel [test platform:rpm]
-python3 [test platform:rpm]
 
 # ansible-pylibssh
 gcc [compile test platform:rpm]
 libssh-devel [compile test platform:rpm]
 python3-Cython [test platform:fedora-35]
-python38-Cython [compile platform:centos-8 platform:rhel-8]
+python3-Cython [compile platform:centos-8 platform:rhel-8]

changelogs/fragments/bindep_fix.yaml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - Fix 'python3-Cython' dependency in bindep.txt.

galaxy.yml

@@ -13,4 +13,4 @@ issues: https://github.com/ansible-collections/cisco.asa/issues
 tags: [cisco, asa, networking, security]
 # NOTE(pabelanger): We create an empty version key to keep ansible-galaxy
 # happy. We dynamically inject version info based on git information.
-version: 4.0.2-dev
+version: 4.0.2-dev

plugins/module_utils/network/asa/utils/utils.py

@@ -70,7 +70,7 @@ def new_dict_to_set(input_dict, temp_list, test_set, count=0):
                 temp_list.append(k)
                 for each in v:
                     if isinstance(each, dict):
-                        if [True for i in each.values() if type(i) == list]:
+                        if [True for i in each.values() if isinstance(i, list)]:
                             new_dict_to_set(each, temp_list, test_set, count)
                         else:
                             new_dict_to_set(each, temp_list, test_set, 0)

tests/sanity/ignore-2.17.txt

@@ -0,0 +1 @@
+plugins/action/asa.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`

tests/unit/mock/loader.py

@@ -31,7 +31,7 @@
 class DictDataLoader(DataLoader):
     def __init__(self, file_mapping=None):
         file_mapping = {} if file_mapping is None else file_mapping
-        assert type(file_mapping) == dict
+        assert isinstance(file_mapping, dict)
 
         super(DictDataLoader, self).__init__()