ansible-core 2.16.7rc1__py3-none-any.whl → 2.17.0__py3-none-any.whl

ansible/config/manager.py

@@ -1,8 +1,7 @@
 # Copyright: (c) 2017, 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
+from __future__ import annotations
 
 import atexit
 import configparser
@@ -23,11 +22,9 @@ from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.parsing.quoting import unquote
 from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
-from ansible.utils import py3compat
 from ansible.utils.path import cleanup_tmp_file, makedirs_safe, unfrackpath
 
 
-Plugin = namedtuple('Plugin', 'name type')
 Setting = namedtuple('Setting', 'name value origin type')
 
 INTERNAL_DEFS = {'lookup': ('_terms',)}
@@ -45,7 +42,7 @@ def _get_entry(plugin_type, plugin_name, config):
 
 
 # FIXME: see if we can unify in module_utils with similar function used by argspec
-def ensure_type(value, value_type, origin=None):
+def ensure_type(value, value_type, origin=None, origin_ftype=None):
     ''' return a configuration variable with casting
     :arg value: The value to ensure correct typing of
     :kwarg value_type: The type of the value.  This can be any of the following strings:
@@ -144,7 +141,7 @@ def ensure_type(value, value_type, origin=None):
         elif value_type in ('str', 'string'):
             if isinstance(value, (string_types, AnsibleVaultEncryptedUnicode, bool, int, float, complex)):
                 value = to_text(value, errors='surrogate_or_strict')
-                if origin == 'ini':
+                if origin_ftype and origin_ftype == 'ini':
                     value = unquote(value)
             else:
                 errmsg = 'string'
@@ -152,7 +149,7 @@ def ensure_type(value, value_type, origin=None):
         # defaults to string type
         elif isinstance(value, (string_types, AnsibleVaultEncryptedUnicode)):
             value = to_text(value, errors='surrogate_or_strict')
-            if origin == 'ini':
+            if origin_ftype and origin_ftype == 'ini':
                 value = unquote(value)
 
         if errmsg:
@@ -473,6 +470,7 @@ class ConfigManager(object):
         # Note: sources that are lists listed in low to high precedence (last one wins)
         value = None
         origin = None
+        origin_ftype = None
 
         defs = self.get_configuration_definitions(plugin_type, plugin_name)
         if config in defs:
@@ -525,31 +523,40 @@ class ConfigManager(object):
 
             # env vars are next precedence
             if value is None and defs[config].get('env'):
-                value, origin = self._loop_entries(py3compat.environ, defs[config]['env'])
+                value, origin = self._loop_entries(os.environ, defs[config]['env'])
                 origin = 'env: %s' % origin
 
             # try config file entries next, if we have one
             if self._parsers.get(cfile, None) is None:
                 self._parse_config_file(cfile)
 
+            # attempt to read from config file
             if value is None and cfile is not None:
                 ftype = get_config_type(cfile)
                 if ftype and defs[config].get(ftype):
-                    if ftype == 'ini':
-                        # load from ini config
-                        try:  # FIXME: generalize _loop_entries to allow for files also, most of this code is dupe
-                            for ini_entry in defs[config]['ini']:
-                                temp_value = get_ini_config_value(self._parsers[cfile], ini_entry)
-                                if temp_value is not None:
-                                    value = temp_value
-                                    origin = cfile
-                                    if 'deprecated' in ini_entry:
-                                        self.DEPRECATED.append(('[%s]%s' % (ini_entry['section'], ini_entry['key']), ini_entry['deprecated']))
-                        except Exception as e:
-                            sys.stderr.write("Error while loading ini config %s: %s" % (cfile, to_native(e)))
-                    elif ftype == 'yaml':
-                        # FIXME: implement, also , break down key from defs (. notation???)
-                        origin = cfile
+                    try:
+                        for entry in defs[config][ftype]:
+                            # load from config
+                            if ftype == 'ini':
+                                temp_value = get_ini_config_value(self._parsers[cfile], entry)
+                            elif ftype == 'yaml':
+                                raise AnsibleError('YAML configuration type has not been implemented yet')
+                            else:
+                                raise AnsibleError('Invalid configuration file type: %s' % ftype)
+
+                            if temp_value is not None:
+                                # set value and origin
+                                value = temp_value
+                                origin = cfile
+                                origin_ftype = ftype
+                                if 'deprecated' in entry:
+                                    if ftype == 'ini':
+                                        self.DEPRECATED.append(('[%s]%s' % (entry['section'], entry['key']), entry['deprecated']))
+                                    else:
+                                        raise AnsibleError('Unimplemented file type: %s' % ftype)
+
+                    except Exception as e:
+                        sys.stderr.write("Error while loading config %s: %s" % (cfile, to_native(e)))
 
             # set default if we got here w/o a value
             if value is None:
@@ -561,12 +568,13 @@ class ConfigManager(object):
                     origin = 'default'
                     value = self.template_default(defs[config].get('default'), variables)
             try:
-                value = ensure_type(value, defs[config].get('type'), origin=origin)
+                # ensure correct type, can raise exceptions on mismatched types
+                value = ensure_type(value, defs[config].get('type'), origin=origin, origin_ftype=origin_ftype)
             except ValueError as e:
                 if origin.startswith('env:') and value == '':
                     # this is empty env var for non string so we can set to default
                     origin = 'default'
-                    value = ensure_type(defs[config].get('default'), defs[config].get('type'), origin=origin)
+                    value = ensure_type(defs[config].get('default'), defs[config].get('type'), origin=origin, origin_ftype=origin_ftype)
                 else:
                     raise AnsibleOptionsError('Invalid type for configuration option %s (from %s): %s' %
                                               (to_native(_get_entry(plugin_type, plugin_name, config)).strip(), origin, to_native(e)))

ansible/constants.py

@@ -2,8 +2,7 @@
 # Copyright: (c) 2017, 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
+from __future__ import annotations
 
 import re
 

ansible/context.py

@@ -1,10 +1,6 @@
 # Copyright: (c) 2018, Toshio Kuratomi <tkuratomi@ansible.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 """
 Context of the running Ansible.
 
@@ -14,6 +10,7 @@ running the ansible command line tools.
 
 These APIs are still in flux so do not use them unless you are willing to update them with every Ansible release
 """
+from __future__ import annotations
 
 from collections.abc import Mapping, Set
 

ansible/errors/__init__.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import re
 import traceback

ansible/errors/yaml_strings.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 __all__ = [
     'YAML_SYNTAX_ERROR',

ansible/executor/__init__.py

@@ -15,6 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations

ansible/executor/discovery/python_target.py

@@ -4,8 +4,7 @@
 # FUTURE: this could be swapped out for our bundled version of distro to move more complete platform
 # logic to the targets, so long as we maintain Py2.6 compat and don't need to do any kind of script assembly
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import json
 import platform

ansible/executor/interpreter_discovery.py

@@ -1,8 +1,7 @@
 # Copyright: (c) 2018 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
+from __future__ import annotations
 
 import bisect
 import json
@@ -10,6 +9,7 @@ import pkgutil
 import re
 
 from ansible import constants as C
+from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.distro import LinuxDistribution
 from ansible.utils.display import Display
@@ -53,7 +53,7 @@ def discover_interpreter(action, interpreter_name, discovery_mode, task_vars):
     host = task_vars.get('inventory_hostname', 'unknown')
     res = None
     platform_type = 'unknown'
-    found_interpreters = [u'/usr/bin/python']  # fallback value
+    found_interpreters = [u'/usr/bin/python3']  # fallback value
     is_auto_legacy = discovery_mode.startswith('auto_legacy')
     is_silent = discovery_mode.endswith('_silent')
 
@@ -89,7 +89,7 @@ def discover_interpreter(action, interpreter_name, discovery_mode, task_vars):
                 action._discovery_warnings.append(u'No python interpreters found for '
                                                   u'host {0} (tried {1})'.format(host, bootstrap_python_list))
             # this is lame, but returning None or throwing an exception is uglier
-            return u'/usr/bin/python'
+            return u'/usr/bin/python3'
 
         if platform_type != 'linux':
             raise NotImplementedError('unsupported platform for extended discovery: {0}'.format(to_native(platform_type)))
@@ -106,7 +106,6 @@ def discover_interpreter(action, interpreter_name, discovery_mode, task_vars):
         platform_info = json.loads(res.get('stdout'))
 
         distro, version = _get_linux_distro(platform_info)
-
         if not distro or not version:
             raise NotImplementedError('unable to get Linux distribution/version info')
 
@@ -120,15 +119,15 @@ def discover_interpreter(action, interpreter_name, discovery_mode, task_vars):
 
         # provide a transition period for hosts that were using /usr/bin/python previously (but shouldn't have been)
         if is_auto_legacy:
-            if platform_interpreter != u'/usr/bin/python' and u'/usr/bin/python' in found_interpreters:
+            if platform_interpreter != u'/usr/bin/python3' and u'/usr/bin/python3' in found_interpreters:
                 if not is_silent:
                     action._discovery_warnings.append(
                         u"Distribution {0} {1} on host {2} should use {3}, but is using "
-                        u"/usr/bin/python for backward compatibility with prior Ansible releases. "
+                        u"/usr/bin/python3 for backward compatibility with prior Ansible releases. "
                         u"See {4} for more information"
                         .format(distro, version, host, platform_interpreter,
                                 get_versioned_doclink('reference_appendices/interpreter_discovery.html')))
-                return u'/usr/bin/python'
+                return u'/usr/bin/python3'
 
         if platform_interpreter not in found_interpreters:
             if platform_interpreter not in bootstrap_python_list:
@@ -150,6 +149,8 @@ def discover_interpreter(action, interpreter_name, discovery_mode, task_vars):
         return platform_interpreter
     except NotImplementedError as ex:
         display.vvv(msg=u'Python interpreter discovery fallback ({0})'.format(to_text(ex)), host=host)
+    except AnsibleError:
+        raise
     except Exception as ex:
         if not is_silent:
             display.warning(msg=u'Unhandled error in Python interpreter discovery for host {0}: {1}'.format(host, to_text(ex)))

ansible/executor/module_common.py

@@ -16,9 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import ast
 import base64

ansible/executor/play_iterator.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import fnmatch
 

ansible/executor/playbook_executor.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 

ansible/executor/powershell/module_manifest.py

@@ -1,8 +1,7 @@
 # (c) 2018 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
+from __future__ import annotations
 
 import base64
 import errno
@@ -11,13 +10,13 @@ import os
 import pkgutil
 import random
 import re
+from importlib import import_module
 
 from ansible.module_utils.compat.version import LooseVersion
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
-from ansible.module_utils.compat.importlib import import_module
 from ansible.plugins.loader import ps_module_utils_loader
 from ansible.utils.collection_loader import resource_from_fqcr
 

ansible/executor/process/__init__.py

@@ -15,6 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations

ansible/executor/process/worker.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 import sys

ansible/executor/stats.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 from collections.abc import MutableMapping
 

ansible/executor/task_executor.py

@@ -1,8 +1,7 @@
 # (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
 # (c) 2017 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
+from __future__ import annotations
 
 import os
 import pty
@@ -225,7 +224,7 @@ class TaskExecutor:
         if self._task.loop_with:
             if self._task.loop_with in self._shared_loader_obj.lookup_loader:
 
-                # TODO: hardcoded so it fails for non first_found lookups, but thhis shoudl be generalized for those that don't do their own templating
+                # TODO: hardcoded so it fails for non first_found lookups, but this should be generalized for those that don't do their own templating
                 # lookup prop/attribute?
                 fail = bool(self._task.loop_with != 'first_found')
                 loop_terms = listify_lookup_plugin_terms(terms=self._task.loop, templar=templar, fail_on_undefined=fail, convert_bare=False)

ansible/executor/task_queue_manager.py

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 import sys

ansible/executor/task_result.py

@@ -2,8 +2,7 @@
 
 # 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
+from __future__ import annotations
 
 from ansible import constants as C
 from ansible.parsing.dataloader import DataLoader
@@ -55,7 +54,7 @@ class TaskResult:
         if 'results' in self._result:
             results = self._result['results']
             # Loop tasks are only considered skipped if all items were skipped.
-            # some squashed results (eg, yum) are not dicts and can't be skipped individually
+            # some squashed results (eg, dnf) are not dicts and can't be skipped individually
             if results and all(isinstance(res, dict) and res.get('skipped', False) for res in results):
                 return True
 

ansible/galaxy/__init__.py

@@ -20,8 +20,7 @@
 ########################################################################
 ''' This manages remote shared Ansible objects, mainly roles'''
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 

ansible/galaxy/api.py

@@ -2,8 +2,7 @@
 # Copyright: (c) 2019, 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
+from __future__ import annotations
 
 import collections
 import datetime
@@ -134,6 +133,15 @@ def g_connect(versions):
                                    % (method.__name__, ", ".join(versions), ", ".join(available_versions),
                                       self.name, self.api_server))
 
+            # Warn only when we know we are talking to a collections API
+            if common_versions == {'v2'}:
+                display.deprecated(
+                    'The v2 Ansible Galaxy API is deprecated and no longer supported. '
+                    'Ensure that you have configured the ansible-galaxy CLI to utilize an '
+                    'updated and supported version of Ansible Galaxy.',
+                    version='2.20'
+                )
+
             return method(self, *args, **kwargs)
         return wrapped
     return decorator