ansible-core 2.15.4rc1__py3-none-any.whl → 2.16.0b2__py3-none-any.whl

ansible/module_utils/facts/hardware/linux.py

@@ -28,7 +28,7 @@ import time
 from multiprocessing import cpu_count
 from multiprocessing.pool import ThreadPool
 
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.common.locale import get_best_parsable_locale
 from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.common.text.formatters import bytes_to_human
@@ -550,7 +550,7 @@ class LinuxHardware(Hardware):
         # start threads to query each mount
         results = {}
         pool = ThreadPool(processes=min(len(mtab_entries), cpu_count()))
-        maxtime = globals().get('GATHER_TIMEOUT') or timeout.DEFAULT_GATHER_TIMEOUT
+        maxtime = timeout.GATHER_TIMEOUT or timeout.DEFAULT_GATHER_TIMEOUT
         for fields in mtab_entries:
             # Transform octal escape sequences
             fields = [self._replace_octal_escapes(field) for field in fields]

ansible/module_utils/facts/hardware/openbsd.py

@@ -19,7 +19,7 @@ __metaclass__ = type
 import re
 import time
 
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 
 from ansible.module_utils.facts.hardware.base import Hardware, HardwareCollector
 from ansible.module_utils.facts import timeout

ansible/module_utils/facts/network/linux.py

@@ -89,11 +89,11 @@ class LinuxNetwork(Network):
                         locally_reachable_ips['ipv4'].append(address)
 
         args = [ip_path, '-4', 'route', 'show', 'table', 'local']
-        rc, routes, _ = self.module.run_command(args)
+        rc, routes, dummy = self.module.run_command(args)
         if rc == 0:
             parse_locally_reachable_ips(routes)
         args = [ip_path, '-6', 'route', 'show', 'table', 'local']
-        rc, routes, _ = self.module.run_command(args)
+        rc, routes, dummy = self.module.run_command(args)
         if rc == 0:
             parse_locally_reachable_ips(routes)
 
@@ -274,7 +274,7 @@ class LinuxNetwork(Network):
                     elif words[0] == 'inet6':
                         if 'peer' == words[2]:
                             address = words[1]
-                            _, prefix = words[3].split('/')
+                            dummy, prefix = words[3].split('/')
                             scope = words[5]
                         else:
                             address, prefix = words[1].split('/')

ansible/module_utils/facts/other/facter.py

@@ -1,17 +1,5 @@
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2023 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
@@ -21,7 +9,6 @@ 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
 
 
@@ -49,6 +36,12 @@ class FacterFactCollector(BaseFactCollector):
         # if facter is installed, and we can use --json because
         # ruby-json is ALSO installed, include facter data in the JSON
         rc, out, err = module.run_command(facter_path + " --puppet --json")
+
+        # for some versions of facter, --puppet returns an error if puppet is not present,
+        # try again w/o it, other errors should still appear and be sent back
+        if rc != 0:
+            rc, out, err = module.run_command(facter_path + " --json")
+
         return rc, out, err
 
     def get_facter_output(self, module):

ansible/module_utils/facts/sysctl.py

@@ -18,7 +18,7 @@ __metaclass__ = type
 
 import re
 
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 
 
 def get_sysctl(module, prefixes):

ansible/module_utils/facts/system/date_time.py

@@ -22,8 +22,8 @@ import datetime
 import time
 
 import ansible.module_utils.compat.typing as t
-
 from ansible.module_utils.facts.collector import BaseFactCollector
+from ansible.module_utils.compat.datetime import utcfromtimestamp
 
 
 class DateTimeFactCollector(BaseFactCollector):
@@ -37,7 +37,7 @@ class DateTimeFactCollector(BaseFactCollector):
         # Store the timestamp once, then get local and UTC versions from that
         epoch_ts = time.time()
         now = datetime.datetime.fromtimestamp(epoch_ts)
-        utcnow = datetime.datetime.utcfromtimestamp(epoch_ts)
+        utcnow = utcfromtimestamp(epoch_ts).replace(tzinfo=None)
 
         date_time_facts['year'] = now.strftime('%Y')
         date_time_facts['month'] = now.strftime('%m')

ansible/module_utils/facts/system/distribution.py

@@ -524,7 +524,7 @@ class Distribution(object):
                      'Solaris': ['Solaris', 'Nexenta', 'OmniOS', 'OpenIndiana', 'SmartOS'],
                      'Slackware': ['Slackware'],
                      'Altlinux': ['Altlinux'],
-                     'SGML': ['SGML'],
+                     'SMGL': ['SMGL'],
                      'Gentoo': ['Gentoo', 'Funtoo'],
                      'Alpine': ['Alpine'],
                      'AIX': ['AIX'],

ansible/module_utils/facts/system/local.py

@@ -23,9 +23,10 @@ import stat
 
 import ansible.module_utils.compat.typing as t
 
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.collector import BaseFactCollector
+from ansible.module_utils.six import PY3
 from ansible.module_utils.six.moves import configparser, StringIO
 
 
@@ -91,7 +92,10 @@ class LocalFactCollector(BaseFactCollector):
                 # if that fails read it with ConfigParser
                 cp = configparser.ConfigParser()
                 try:
-                    cp.readfp(StringIO(out))
+                    if PY3:
+                        cp.read_file(StringIO(out))
+                    else:
+                        cp.readfp(StringIO(out))
                 except configparser.Error:
                     fact = "error loading facts as JSON or ini - please check content: %s" % fn
                     module.warn(fact)

ansible/module_utils/facts/system/pkg_mgr.py

@@ -85,14 +85,19 @@ class PkgMgrFactCollector(BaseFactCollector):
                 break
 
         try:
-            distro_major_ver = int(collected_facts['ansible_distribution_major_version'])
+            major_version = collected_facts['ansible_distribution_major_version']
+            if collected_facts['ansible_distribution'] == 'Kylin Linux Advanced Server':
+                major_version = major_version.lstrip('V')
+            distro_major_ver = int(major_version)
         except ValueError:
             # a non integer magical future version
             return self._default_unknown_pkg_mgr
 
         if (
             (collected_facts['ansible_distribution'] == 'Fedora' and distro_major_ver < 23)
+            or (collected_facts['ansible_distribution'] == 'Kylin Linux Advanced Server' and distro_major_ver < 10)
             or (collected_facts['ansible_distribution'] == 'Amazon' and distro_major_ver < 2022)
+            or (collected_facts['ansible_distribution'] == 'TencentOS' and distro_major_ver < 3)
             or distro_major_ver < 8  # assume RHEL or a clone
         ) and any(pm for pm in PKG_MGRS if pm['name'] == 'yum' and os.path.exists(pm['path'])):
             pkg_mgr_name = 'yum'

ansible/module_utils/facts/system/service_mgr.py

@@ -24,7 +24,7 @@ import re
 
 import ansible.module_utils.compat.typing as t
 
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.collector import BaseFactCollector
@@ -47,7 +47,7 @@ class ServiceMgrFactCollector(BaseFactCollector):
         # tools must be installed
         if module.get_bin_path('systemctl'):
 
-            # this should show if systemd is the boot init system, if checking init faild to mark as systemd
+            # this should show if systemd is the boot init system, if checking init failed to mark as systemd
             # these mirror systemd's own sd_boot test http://www.freedesktop.org/software/systemd/man/sd_booted.html
             for canary in ["/run/systemd/system/", "/dev/.run/systemd/", "/dev/.systemd/"]:
                 if os.path.exists(canary):
@@ -131,6 +131,8 @@ class ServiceMgrFactCollector(BaseFactCollector):
             service_mgr_name = 'smf'
         elif collected_facts.get('ansible_distribution') == 'OpenWrt':
             service_mgr_name = 'openwrt_init'
+        elif collected_facts.get('ansible_distribution') == 'SMGL':
+            service_mgr_name = 'simpleinit_msb'
         elif collected_facts.get('ansible_system') == 'Linux':
             # FIXME: mv is_systemd_managed
             if self.is_systemd_managed(module=module):

ansible/module_utils/parsing/convert_bool.py

@@ -5,7 +5,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible.module_utils.six import binary_type, text_type
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 
 
 BOOLEANS_TRUE = frozenset(('y', 'yes', 'on', '1', 'true', 't', 1, 1.0, True))

ansible/module_utils/service.py

@@ -39,7 +39,7 @@ import subprocess
 import traceback
 
 from ansible.module_utils.six import PY2, b
-from ansible.module_utils._text import to_bytes, to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_text
 
 
 def sysv_is_enabled(name, runlevel=None):
@@ -207,17 +207,20 @@ def daemonize(module, cmd):
         p = subprocess.Popen(run_cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=lambda: os.close(pipe[1]))
         fds = [p.stdout, p.stderr]
 
-        # loop reading output till its done
+        # loop reading output till it is done
         output = {p.stdout: b(""), p.stderr: b("")}
         while fds:
             rfd, wfd, efd = select.select(fds, [], fds, 1)
-            if (rfd + wfd + efd) or p.poll():
+            if (rfd + wfd + efd) or p.poll() is None:
                 for out in list(fds):
                     if out in rfd:
                         data = os.read(out.fileno(), chunk)
-                        if not data:
+                        if data:
+                            output[out] += to_bytes(data, errors=errors)
+                        else:
                             fds.remove(out)
-                    output[out] += b(data)
+            else:
+                break
 
         # even after fds close, we might want to wait for pid to die
         p.wait()
@@ -246,7 +249,7 @@ def daemonize(module, cmd):
                 data = os.read(pipe[0], chunk)
                 if not data:
                     break
-                return_data += b(data)
+                return_data += to_bytes(data, errors=errors)
 
         # Note: no need to specify encoding on py3 as this module sends the
         # pickle to itself (thus same python interpreter so we aren't mixing

ansible/module_utils/urls.py

@@ -88,7 +88,7 @@ from ansible.module_utils.common.collections import Mapping, is_sequence
 from ansible.module_utils.six import PY2, PY3, string_types
 from ansible.module_utils.six.moves import cStringIO
 from ansible.module_utils.basic import get_distribution, missing_required_lib
-from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 
 try:
     # python3
@@ -129,13 +129,13 @@ if not HAS_SSLCONTEXT:
         try:
             from urllib3.contrib.pyopenssl import PyOpenSSLContext
         except Exception:
-            from requests.packages.urllib3.contrib.pyopenssl import PyOpenSSLContext
+            from requests.packages.urllib3.contrib.pyopenssl import PyOpenSSLContext  # type: ignore[no-redef]
         HAS_URLLIB3_PYOPENSSLCONTEXT = True
     except Exception:
         # urllib3<1.15,>=1.6
         try:
             try:
-                from urllib3.contrib.pyopenssl import ssl_wrap_socket
+                from urllib3.contrib.pyopenssl import ssl_wrap_socket  # type: ignore[attr-defined]
             except Exception:
                 from requests.packages.urllib3.contrib.pyopenssl import ssl_wrap_socket
             HAS_URLLIB3_SSL_WRAP_SOCKET = True
@@ -771,6 +771,18 @@ def extract_pem_certs(b_data):
         yield match.group(0)
 
 
+def _py2_get_param(headers, param, header='content-type'):
+    m = httplib.HTTPMessage(io.StringIO())
+    cd = headers.getheader(header) or ''
+    try:
+        m.plisttext = cd[cd.index(';'):]
+        m.parseplist()
+    except ValueError:
+        return None
+
+    return m.getparam(param)
+
+
 def get_response_filename(response):
     url = response.geturl()
     path = urlparse(url)[2]
@@ -778,7 +790,12 @@ def get_response_filename(response):
     if filename:
         filename = unquote(filename)
 
-    return response.headers.get_param('filename', header='content-disposition') or filename
+    if PY2:
+        get_param = functools.partial(_py2_get_param, response.headers)
+    else:
+        get_param = response.headers.get_param
+
+    return get_param('filename', header='content-disposition') or filename
 
 
 def parse_content_type(response):
@@ -865,7 +882,7 @@ def RedirectHandlerFactory(follow_redirects=None, validate_certs=True, ca_path=N
         to determine how redirects should be handled in urllib2.
         """
 
-        def redirect_request(self, req, fp, code, msg, hdrs, newurl):
+        def redirect_request(self, req, fp, code, msg, headers, newurl):
             if not any((HAS_SSLCONTEXT, HAS_URLLIB3_PYOPENSSLCONTEXT)):
                 handler = maybe_add_ssl_handler(newurl, validate_certs, ca_path=ca_path, ciphers=ciphers)
                 if handler:
@@ -873,23 +890,23 @@ def RedirectHandlerFactory(follow_redirects=None, validate_certs=True, ca_path=N
 
             # Preserve urllib2 compatibility
             if follow_redirects == 'urllib2':
-                return urllib_request.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, hdrs, newurl)
+                return urllib_request.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, headers, newurl)
 
             # Handle disabled redirects
             elif follow_redirects in ['no', 'none', False]:
-                raise urllib_error.HTTPError(newurl, code, msg, hdrs, fp)
+                raise urllib_error.HTTPError(newurl, code, msg, headers, fp)
 
             method = req.get_method()
 
             # Handle non-redirect HTTP status or invalid follow_redirects
             if follow_redirects in ['all', 'yes', True]:
                 if code < 300 or code >= 400:
-                    raise urllib_error.HTTPError(req.get_full_url(), code, msg, hdrs, fp)
+                    raise urllib_error.HTTPError(req.get_full_url(), code, msg, headers, fp)
             elif follow_redirects == 'safe':
                 if code < 300 or code >= 400 or method not in ('GET', 'HEAD'):
-                    raise urllib_error.HTTPError(req.get_full_url(), code, msg, hdrs, fp)
+                    raise urllib_error.HTTPError(req.get_full_url(), code, msg, headers, fp)
             else:
-                raise urllib_error.HTTPError(req.get_full_url(), code, msg, hdrs, fp)
+                raise urllib_error.HTTPError(req.get_full_url(), code, msg, headers, fp)
 
             try:
                 # Python 2-3.3
@@ -906,12 +923,12 @@ def RedirectHandlerFactory(follow_redirects=None, validate_certs=True, ca_path=N
             # Support redirect with payload and original headers
             if code in (307, 308):
                 # Preserve payload and headers
-                headers = req.headers
+                req_headers = req.headers
             else:
                 # Do not preserve payload and filter headers
                 data = None
-                headers = dict((k, v) for k, v in req.headers.items()
-                               if k.lower() not in ("content-length", "content-type", "transfer-encoding"))
+                req_headers = dict((k, v) for k, v in req.headers.items()
+                                   if k.lower() not in ("content-length", "content-type", "transfer-encoding"))
 
                 # http://tools.ietf.org/html/rfc7231#section-6.4.4
                 if code == 303 and method != 'HEAD':
@@ -928,7 +945,7 @@ def RedirectHandlerFactory(follow_redirects=None, validate_certs=True, ca_path=N
 
             return RequestWithMethod(newurl,
                                      method=method,
-                                     headers=headers,
+                                     headers=req_headers,
                                      data=data,
                                      origin_req_host=origin_req_host,
                                      unverifiable=True,
@@ -1497,7 +1514,7 @@ class Request:
                     login = None
 
                 if login:
-                    username, _, password = login
+                    username, dummy, password = login
                     if username and password:
                         headers["Authorization"] = basic_auth_header(username, password)
 
@@ -1869,12 +1886,8 @@ def fetch_url(module, url, data=None, headers=None, method=None,
     if not HAS_URLPARSE:
         module.fail_json(msg='urlparse is not installed')
 
-    if not HAS_GZIP and decompress is True:
-        decompress = False
-        module.deprecate(
-            '%s. "decompress" has been automatically disabled to prevent a failure' % GzipDecodedReader.missing_gzip_error(),
-            version='2.16'
-        )
+    if not HAS_GZIP:
+        module.fail_json(msg=GzipDecodedReader.missing_gzip_error())
 
     # ensure we use proper tempdir
     old_tempdir = tempfile.tempdir
@@ -1888,7 +1901,7 @@ def fetch_url(module, url, data=None, headers=None, method=None,
 
     username = module.params.get('url_username', '')
     password = module.params.get('url_password', '')
-    http_agent = module.params.get('http_agent', 'ansible-httpget')
+    http_agent = module.params.get('http_agent', get_user_agent())
     force_basic_auth = module.params.get('force_basic_auth', '')
 
     follow_redirects = module.params.get('follow_redirects', 'urllib2')
@@ -2072,3 +2085,8 @@ def fetch_file(module, url, data=None, headers=None, method=None,
     except Exception as e:
         module.fail_json(msg="Failure downloading %s, %s" % (url, to_native(e)))
     return fetch_temp_file.name
+
+
+def get_user_agent():
+    """Returns a user agent used by open_url"""
+    return u"ansible-httpget"

ansible/modules/add_host.py

@@ -59,8 +59,8 @@ attributes:
     platform:
         platforms: all
 notes:
-- The alias C(host) of the parameter C(name) is only available on Ansible 2.4 and newer.
-- Since Ansible 2.4, the C(inventory_dir) variable is now set to C(None) instead of the 'global inventory source',
+- The alias O(host) of the parameter O(name) is only available on Ansible 2.4 and newer.
+- Since Ansible 2.4, the C(inventory_dir) variable is now set to V(None) instead of the 'global inventory source',
   because you can now have multiple sources.  An example was added that shows how to partially restore the previous behaviour.
 - Though this module does not change the remote host, we do provide 'changed' status as it can be useful for those trying to track inventory changes.
 - The hosts added will not bypass the C(--limit) from the command line, so both of those need to be in agreement to make them available as play targets.