diff --git a/lib/ansible/module_utils/compat/version.py b/lib/ansible/module_utils/compat/version.py index 59ee9dbc013..fbd82f589a6 100644 --- a/lib/ansible/module_utils/compat/version.py +++ b/lib/ansible/module_utils/compat/version.py @@ -31,7 +31,7 @@ __metaclass__ = type import re try: - RE_FLAGS = re.VERBOSE | re.ASCII + RE_FLAGS = re.VERBOSE | re.ASCII # type: ignore[attr-defined] except AttributeError: RE_FLAGS = re.VERBOSE diff --git a/lib/ansible/module_utils/facts/ansible_collector.py b/lib/ansible/module_utils/facts/ansible_collector.py index f8238afe314..e9bafe297c5 100644 --- a/lib/ansible/module_utils/facts/ansible_collector.py +++ b/lib/ansible/module_utils/facts/ansible_collector.py @@ -32,6 +32,8 @@ __metaclass__ = type import fnmatch import sys +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts import timeout from ansible.module_utils.facts import collector from ansible.module_utils.common.collections import is_string @@ -104,7 +106,7 @@ class CollectorMetaDataCollector(collector.BaseFactCollector): '''Collector that provides a facts with the gather_subset metadata.''' name = 'gather_subset' - _fact_ids = set([]) + _fact_ids = set() # type: t.Set[str] def __init__(self, collectors=None, namespace=None, gather_subset=None, module_setup=None): super(CollectorMetaDataCollector, self).__init__(collectors, namespace) diff --git a/lib/ansible/module_utils/facts/collector.py b/lib/ansible/module_utils/facts/collector.py index 6b2a2fdda19..ac52fe8b4d3 100644 --- a/lib/ansible/module_utils/facts/collector.py +++ b/lib/ansible/module_utils/facts/collector.py @@ -33,6 +33,8 @@ from collections import defaultdict import platform +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts import timeout @@ -56,11 +58,11 @@ class CollectorNotFoundError(KeyError): class BaseFactCollector: - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] _platform = 'Generic' name = None # type: str | None - required_facts = set() + required_facts = set() # type: t.Set[str] def __init__(self, collectors=None, namespace=None): '''Base class for things that collect facts. diff --git a/lib/ansible/module_utils/facts/hardware/base.py b/lib/ansible/module_utils/facts/hardware/base.py index ce7ca7e452e..846bb302320 100644 --- a/lib/ansible/module_utils/facts/hardware/base.py +++ b/lib/ansible/module_utils/facts/hardware/base.py @@ -29,6 +29,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector @@ -50,7 +52,7 @@ class HardwareCollector(BaseFactCollector): 'processor_count', # TODO: mounts isnt exactly hardware 'mounts', - 'devices']) + 'devices']) # type: t.Set[str] _fact_class = Hardware def collect(self, module=None, collected_facts=None): diff --git a/lib/ansible/module_utils/facts/network/base.py b/lib/ansible/module_utils/facts/network/base.py index fe38ba82d30..8243f06ccfe 100644 --- a/lib/ansible/module_utils/facts/network/base.py +++ b/lib/ansible/module_utils/facts/network/base.py @@ -16,6 +16,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector @@ -48,7 +50,7 @@ class NetworkCollector(BaseFactCollector): 'default_ipv4', 'default_ipv6', 'all_ipv4_addresses', - 'all_ipv6_addresses']) + 'all_ipv6_addresses']) # type: t.Set[str] IPV6_SCOPE = {'0': 'global', '10': 'host', diff --git a/lib/ansible/module_utils/facts/network/fc_wwn.py b/lib/ansible/module_utils/facts/network/fc_wwn.py index 77e015d9c92..86182f89343 100644 --- a/lib/ansible/module_utils/facts/network/fc_wwn.py +++ b/lib/ansible/module_utils/facts/network/fc_wwn.py @@ -21,13 +21,15 @@ __metaclass__ = type import sys import glob +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_lines from ansible.module_utils.facts.collector import BaseFactCollector class FcWwnInitiatorFactCollector(BaseFactCollector): name = 'fibre_channel_wwn' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): """ diff --git a/lib/ansible/module_utils/facts/network/iscsi.py b/lib/ansible/module_utils/facts/network/iscsi.py index 33b2737bd57..2bb93834236 100644 --- a/lib/ansible/module_utils/facts/network/iscsi.py +++ b/lib/ansible/module_utils/facts/network/iscsi.py @@ -21,6 +21,8 @@ __metaclass__ = type import sys import subprocess +import ansible.module_utils.compat.typing as t + from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.network.base import NetworkCollector @@ -28,7 +30,7 @@ from ansible.module_utils.facts.network.base import NetworkCollector class IscsiInitiatorNetworkCollector(NetworkCollector): name = 'iscsi' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): """ diff --git a/lib/ansible/module_utils/facts/network/nvme.py b/lib/ansible/module_utils/facts/network/nvme.py index 5111a90b4cd..febd0abb38c 100644 --- a/lib/ansible/module_utils/facts/network/nvme.py +++ b/lib/ansible/module_utils/facts/network/nvme.py @@ -21,13 +21,15 @@ __metaclass__ = type import sys import subprocess +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.network.base import NetworkCollector class NvmeInitiatorNetworkCollector(NetworkCollector): name = 'nvme' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): """ diff --git a/lib/ansible/module_utils/facts/other/facter.py b/lib/ansible/module_utils/facts/other/facter.py index 899fcc419b8..3f83999d419 100644 --- a/lib/ansible/module_utils/facts/other/facter.py +++ b/lib/ansible/module_utils/facts/other/facter.py @@ -18,6 +18,8 @@ __metaclass__ = type import json +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.namespace import PrefixFactNamespace from ansible.module_utils.facts.collector import BaseFactCollector @@ -25,7 +27,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class FacterFactCollector(BaseFactCollector): name = 'facter' - _fact_ids = set(['facter']) + _fact_ids = set(['facter']) # type: t.Set[str] def __init__(self, collectors=None, namespace=None): namespace = PrefixFactNamespace(namespace_name='facter', diff --git a/lib/ansible/module_utils/facts/other/ohai.py b/lib/ansible/module_utils/facts/other/ohai.py index df292376863..90c553980b9 100644 --- a/lib/ansible/module_utils/facts/other/ohai.py +++ b/lib/ansible/module_utils/facts/other/ohai.py @@ -18,6 +18,8 @@ __metaclass__ = type import json +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.namespace import PrefixFactNamespace from ansible.module_utils.facts.collector import BaseFactCollector @@ -26,7 +28,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class OhaiFactCollector(BaseFactCollector): '''This is a subclass of Facts for including information gathered from Ohai.''' name = 'ohai' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def __init__(self, collectors=None, namespace=None): namespace = PrefixFactNamespace(namespace_name='ohai', diff --git a/lib/ansible/module_utils/facts/system/apparmor.py b/lib/ansible/module_utils/facts/system/apparmor.py index 53c3ed1856f..3b702f9d323 100644 --- a/lib/ansible/module_utils/facts/system/apparmor.py +++ b/lib/ansible/module_utils/facts/system/apparmor.py @@ -20,12 +20,14 @@ __metaclass__ = type import os +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector class ApparmorFactCollector(BaseFactCollector): name = 'apparmor' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): facts_dict = {} diff --git a/lib/ansible/module_utils/facts/system/caps.py b/lib/ansible/module_utils/facts/system/caps.py index 5c376d5e6e8..6a1e26d527c 100644 --- a/lib/ansible/module_utils/facts/system/caps.py +++ b/lib/ansible/module_utils/facts/system/caps.py @@ -18,6 +18,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t from ansible.module_utils._text import to_text from ansible.module_utils.facts.collector import BaseFactCollector @@ -26,7 +27,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class SystemCapabilitiesFactCollector(BaseFactCollector): name = 'caps' _fact_ids = set(['system_capabilities', - 'system_capabilities_enforced']) + 'system_capabilities_enforced']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): diff --git a/lib/ansible/module_utils/facts/system/chroot.py b/lib/ansible/module_utils/facts/system/chroot.py index 25c61125d5d..94138a004f5 100644 --- a/lib/ansible/module_utils/facts/system/chroot.py +++ b/lib/ansible/module_utils/facts/system/chroot.py @@ -5,6 +5,8 @@ __metaclass__ = type import os +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector @@ -41,7 +43,7 @@ def is_chroot(module=None): class ChrootFactCollector(BaseFactCollector): name = 'chroot' - _fact_ids = set(['is_chroot']) + _fact_ids = set(['is_chroot']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): return {'is_chroot': is_chroot(module)} diff --git a/lib/ansible/module_utils/facts/system/cmdline.py b/lib/ansible/module_utils/facts/system/cmdline.py index 1b1b71e7f7b..782186dcaf8 100644 --- a/lib/ansible/module_utils/facts/system/cmdline.py +++ b/lib/ansible/module_utils/facts/system/cmdline.py @@ -18,6 +18,8 @@ __metaclass__ = type import shlex +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.collector import BaseFactCollector @@ -25,7 +27,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class CmdLineFactCollector(BaseFactCollector): name = 'cmdline' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def _get_proc_cmdline(self): return get_file_content('/proc/cmdline') diff --git a/lib/ansible/module_utils/facts/system/date_time.py b/lib/ansible/module_utils/facts/system/date_time.py index 1661042456a..481bef42bfd 100644 --- a/lib/ansible/module_utils/facts/system/date_time.py +++ b/lib/ansible/module_utils/facts/system/date_time.py @@ -21,12 +21,14 @@ __metaclass__ = type import datetime import time +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector class DateTimeFactCollector(BaseFactCollector): name = 'date_time' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): facts_dict = {} diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py index c829fc2901f..d77047fc1a2 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -10,6 +10,8 @@ import os import platform import re +import ansible.module_utils.compat.typing as t + from ansible.module_utils.common.sys_info import get_distribution, get_distribution_version, \ get_distribution_codename from ansible.module_utils.facts.utils import get_file_content @@ -684,7 +686,7 @@ class DistributionFactCollector(BaseFactCollector): _fact_ids = set(['distribution_version', 'distribution_release', 'distribution_major_version', - 'os_family']) + 'os_family']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): collected_facts = collected_facts or {} diff --git a/lib/ansible/module_utils/facts/system/dns.py b/lib/ansible/module_utils/facts/system/dns.py index bd385e9de9d..d913f4a30d4 100644 --- a/lib/ansible/module_utils/facts/system/dns.py +++ b/lib/ansible/module_utils/facts/system/dns.py @@ -16,6 +16,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t from ansible.module_utils.facts.utils import get_file_content @@ -24,7 +25,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class DnsFactCollector(BaseFactCollector): name = 'dns' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): dns_facts = {} diff --git a/lib/ansible/module_utils/facts/system/env.py b/lib/ansible/module_utils/facts/system/env.py index 279aad61535..605443fa39d 100644 --- a/lib/ansible/module_utils/facts/system/env.py +++ b/lib/ansible/module_utils/facts/system/env.py @@ -18,6 +18,8 @@ __metaclass__ = type import os +import ansible.module_utils.compat.typing as t + from ansible.module_utils.six import iteritems from ansible.module_utils.facts.collector import BaseFactCollector @@ -25,7 +27,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class EnvFactCollector(BaseFactCollector): name = 'env' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): env_facts = {} diff --git a/lib/ansible/module_utils/facts/system/fips.py b/lib/ansible/module_utils/facts/system/fips.py index 20ada639f20..7e56610e1b4 100644 --- a/lib/ansible/module_utils/facts/system/fips.py +++ b/lib/ansible/module_utils/facts/system/fips.py @@ -18,6 +18,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.collector import BaseFactCollector @@ -25,7 +27,7 @@ from ansible.module_utils.facts.collector import BaseFactCollector class FipsFactCollector(BaseFactCollector): name = 'fips' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): # NOTE: this is populated even if it is not set diff --git a/lib/ansible/module_utils/facts/system/local.py b/lib/ansible/module_utils/facts/system/local.py index e80fca9eac2..6579aae0a5b 100644 --- a/lib/ansible/module_utils/facts/system/local.py +++ b/lib/ansible/module_utils/facts/system/local.py @@ -21,6 +21,8 @@ import json import os import stat +import ansible.module_utils.compat.typing as t + from ansible.module_utils._text import to_text from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.collector import BaseFactCollector @@ -29,7 +31,7 @@ from ansible.module_utils.six.moves import configparser, StringIO class LocalFactCollector(BaseFactCollector): name = 'local' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): local_facts = {} diff --git a/lib/ansible/module_utils/facts/system/lsb.py b/lib/ansible/module_utils/facts/system/lsb.py index 596e7256f8e..2dc1433fd06 100644 --- a/lib/ansible/module_utils/facts/system/lsb.py +++ b/lib/ansible/module_utils/facts/system/lsb.py @@ -20,13 +20,15 @@ __metaclass__ = type import os +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_lines from ansible.module_utils.facts.collector import BaseFactCollector class LSBFactCollector(BaseFactCollector): name = 'lsb' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] STRIP_QUOTES = r'\'\"\\' def _lsb_release_bin(self, lsb_path, module): diff --git a/lib/ansible/module_utils/facts/system/pkg_mgr.py b/lib/ansible/module_utils/facts/system/pkg_mgr.py index 7383a7afe95..704ea2014d7 100644 --- a/lib/ansible/module_utils/facts/system/pkg_mgr.py +++ b/lib/ansible/module_utils/facts/system/pkg_mgr.py @@ -8,6 +8,8 @@ __metaclass__ = type import os import subprocess +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector # A list of dicts. If there is a platform with more than one @@ -44,7 +46,7 @@ PKG_MGRS = [{'path': '/usr/bin/rpm-ostree', 'name': 'atomic_container'}, class OpenBSDPkgMgrFactCollector(BaseFactCollector): name = 'pkg_mgr' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] _platform = 'OpenBSD' def collect(self, module=None, collected_facts=None): @@ -57,7 +59,7 @@ class OpenBSDPkgMgrFactCollector(BaseFactCollector): # the fact ends up being 'pkg_mgr' so stick with that naming/spelling class PkgMgrFactCollector(BaseFactCollector): name = 'pkg_mgr' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] _platform = 'Generic' required_facts = set(['distribution']) diff --git a/lib/ansible/module_utils/facts/system/platform.py b/lib/ansible/module_utils/facts/system/platform.py index beac7ccbe30..b9478015a72 100644 --- a/lib/ansible/module_utils/facts/system/platform.py +++ b/lib/ansible/module_utils/facts/system/platform.py @@ -20,6 +20,8 @@ import re import socket import platform +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.collector import BaseFactCollector @@ -37,7 +39,7 @@ class PlatformFactCollector(BaseFactCollector): 'machine', 'python_version', 'architecture', - 'machine_id']) + 'machine_id']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): platform_facts = {} diff --git a/lib/ansible/module_utils/facts/system/python.py b/lib/ansible/module_utils/facts/system/python.py index 172a0913ae2..50b66dde3e4 100644 --- a/lib/ansible/module_utils/facts/system/python.py +++ b/lib/ansible/module_utils/facts/system/python.py @@ -18,6 +18,8 @@ __metaclass__ = type import sys +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector try: @@ -32,7 +34,7 @@ except ImportError: class PythonFactCollector(BaseFactCollector): name = 'python' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): python_facts = {} diff --git a/lib/ansible/module_utils/facts/system/selinux.py b/lib/ansible/module_utils/facts/system/selinux.py index d3aa89ded2e..5c6b012bb30 100644 --- a/lib/ansible/module_utils/facts/system/selinux.py +++ b/lib/ansible/module_utils/facts/system/selinux.py @@ -18,6 +18,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector try: @@ -35,7 +37,7 @@ SELINUX_MODE_DICT = { class SelinuxFactCollector(BaseFactCollector): name = 'selinux' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] def collect(self, module=None, collected_facts=None): facts_dict = {} diff --git a/lib/ansible/module_utils/facts/system/service_mgr.py b/lib/ansible/module_utils/facts/system/service_mgr.py index 1ca3cce59f6..d862ac90b54 100644 --- a/lib/ansible/module_utils/facts/system/service_mgr.py +++ b/lib/ansible/module_utils/facts/system/service_mgr.py @@ -22,6 +22,8 @@ import os import platform import re +import ansible.module_utils.compat.typing as t + from ansible.module_utils._text import to_native from ansible.module_utils.facts.utils import get_file_content @@ -37,7 +39,7 @@ if platform.system() != 'SunOS': class ServiceMgrFactCollector(BaseFactCollector): name = 'service_mgr' - _fact_ids = set() + _fact_ids = set() # type: t.Set[str] required_facts = set(['platform', 'distribution']) @staticmethod diff --git a/lib/ansible/module_utils/facts/system/ssh_pub_keys.py b/lib/ansible/module_utils/facts/system/ssh_pub_keys.py index 7c9bcb377d2..85691c73c85 100644 --- a/lib/ansible/module_utils/facts/system/ssh_pub_keys.py +++ b/lib/ansible/module_utils/facts/system/ssh_pub_keys.py @@ -16,6 +16,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.utils import get_file_content from ansible.module_utils.facts.collector import BaseFactCollector @@ -27,7 +29,7 @@ class SshPubKeyFactCollector(BaseFactCollector): 'ssh_host_key_dsa_public', 'ssh_host_key_rsa_public', 'ssh_host_key_ecdsa_public', - 'ssh_host_key_ed25519_public']) + 'ssh_host_key_ed25519_public']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): ssh_pub_key_facts = {} diff --git a/lib/ansible/module_utils/facts/system/user.py b/lib/ansible/module_utils/facts/system/user.py index 35a07759950..2efa9935c4f 100644 --- a/lib/ansible/module_utils/facts/system/user.py +++ b/lib/ansible/module_utils/facts/system/user.py @@ -20,6 +20,8 @@ import getpass import os import pwd +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector @@ -28,7 +30,7 @@ class UserFactCollector(BaseFactCollector): _fact_ids = set(['user_id', 'user_uid', 'user_gid', 'user_gecos', 'user_dir', 'user_shell', 'real_user_id', 'effective_user_id', - 'effective_group_ids']) + 'effective_group_ids']) # type: t.Set[str] def collect(self, module=None, collected_facts=None): user_facts = {} diff --git a/lib/ansible/module_utils/facts/virtual/base.py b/lib/ansible/module_utils/facts/virtual/base.py index cb725b6ac88..67b59a5503a 100644 --- a/lib/ansible/module_utils/facts/virtual/base.py +++ b/lib/ansible/module_utils/facts/virtual/base.py @@ -19,6 +19,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import ansible.module_utils.compat.typing as t + from ansible.module_utils.facts.collector import BaseFactCollector @@ -63,7 +65,7 @@ class VirtualCollector(BaseFactCollector): 'virtualization_role', 'virtualization_tech_guest', 'virtualization_tech_host', - ]) + ]) # type: t.Set[str] def collect(self, module=None, collected_facts=None): collected_facts = collected_facts or {} diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index d224f9e7f3d..f34c5368904 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -68,6 +68,7 @@ except ImportError: # Python 3 import http.client as httplib # type: ignore[no-redef] +import ansible.module_utils.compat.typing as t import ansible.module_utils.six.moves.http_cookiejar as cookiejar import ansible.module_utils.six.moves.urllib.error as urllib_error @@ -86,7 +87,7 @@ except ImportError: import urllib2 as urllib_request # type: ignore[no-redef] from urllib2 import AbstractHTTPHandler, BaseHandler # type: ignore[no-redef] -urllib_request.HTTPRedirectHandler.http_error_308 = urllib_request.HTTPRedirectHandler.http_error_307 +urllib_request.HTTPRedirectHandler.http_error_308 = urllib_request.HTTPRedirectHandler.http_error_307 # type: ignore[attr-defined] try: from ansible.module_utils.six.moves.urllib.parse import urlparse, urlunparse, unquote @@ -160,7 +161,7 @@ if not HAS_SSLCONTEXT and HAS_SSL: # The bundled backports.ssl_match_hostname should really be moved into its own file for processing _BUNDLED_METADATA = {"pypi_name": "backports.ssl_match_hostname", "version": "3.7.0.1"} -LOADED_VERIFY_LOCATIONS = set() +LOADED_VERIFY_LOCATIONS = set() # type: t.Set[str] HAS_MATCH_HOSTNAME = True try: