Fix collections deprecation warning

salt/auth/__init__.py

@@ -13,16 +13,15 @@
 # 5. Cache auth token with relative data opts['token_dir']
 # 6. Interface to verify tokens
 
-# Import python libs
 from __future__ import absolute_import, print_function, unicode_literals
 
 import collections
 import getpass
 import logging
 import random
 import time
+from collections.abc import Iterable, Mapping
 
-# Import salt libs
 import salt.config
 import salt.exceptions
 import salt.loader
@@ -202,9 +201,9 @@ def _allow_custom_expire(self, load):
         if expire_override is True:
             return True
 
-        if isinstance(expire_override, collections.Mapping):
+        if isinstance(expire_override, Mapping):
             expire_whitelist = expire_override.get(load["eauth"], [])
-            if isinstance(expire_whitelist, collections.Iterable):
+            if isinstance(expire_whitelist, Iterable):
                 if load.get("username") in expire_whitelist:
                     return True
 

salt/client/ssh/wrapper/grains.py

@@ -3,23 +3,26 @@
 Return/control aspects of the grains data
 """
 
-# Import python libs
 from __future__ import absolute_import, print_function
 
-import collections
 import copy
 import math
 
-# Import salt libs
 import salt.utils.data
 import salt.utils.dictupdate
 import salt.utils.json
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.exceptions import SaltException
-
-# Import 3rd-party libs
 from salt.ext import six
 
+try:
+    # Python 3
+    from collections.abc import Mapping
+except ImportError:
+    # We still allow Py2 import because this could be executed in a machine with Py2.
+    from collections import Mapping  # pylint: disable=no-name-in-module
+
+
 # Seed the grains dict so cython will build
 __grains__ = {}
 
@@ -261,15 +264,15 @@ def filter_by(lookup_dict, grain="os_family", merge=None, default="default", bas
         if ret is None:
             ret = base_values
 
-        elif isinstance(base_values, collections.Mapping):
-            if not isinstance(ret, collections.Mapping):
+        elif isinstance(base_values, Mapping):
+            if not isinstance(ret, Mapping):
                 raise SaltException(
                     "filter_by default and look-up values must both be dictionaries."
                 )
             ret = salt.utils.dictupdate.update(copy.deepcopy(base_values), ret)
 
     if merge:
-        if not isinstance(merge, collections.Mapping):
+        if not isinstance(merge, Mapping):
             raise SaltException("filter_by merge argument must be a dictionary.")
         else:
             if ret is None:

salt/client/ssh/wrapper/pillar.py

@@ -4,15 +4,19 @@
 """
 from __future__ import absolute_import, print_function
 
-# Import python libs
-import collections
-
 # Import salt libs
 import salt.pillar
 import salt.utils.data
 import salt.utils.dictupdate
 from salt.defaults import DEFAULT_TARGET_DELIM
 
+try:
+    # Python 3
+    from collections.abc import Mapping
+except ImportError:
+    # We still allow Py2 import because this could be executed in a machine with Py2.
+    from collections import Mapping  # pylint: disable=no-name-in-module
+
 
 def get(key, default="", merge=False, delimiter=DEFAULT_TARGET_DELIM):
     """
@@ -53,9 +57,7 @@ def get(key, default="", merge=False, delimiter=DEFAULT_TARGET_DELIM):
     """
     if merge:
         ret = salt.utils.data.traverse_dict_and_list(__pillar__, key, {}, delimiter)
-        if isinstance(ret, collections.Mapping) and isinstance(
-            default, collections.Mapping
-        ):
+        if isinstance(ret, Mapping) and isinstance(default, Mapping):
             return salt.utils.dictupdate.update(default, ret)
 
     return salt.utils.data.traverse_dict_and_list(__pillar__, key, default, delimiter)

salt/fileserver/__init__.py

@@ -363,9 +363,9 @@ def backends(self, back=None):
 
         if isinstance(back, Sequence):
             # The test suite uses an ImmutableList type (based on
-            # collections.Sequence) for lists, which breaks this function in
+            # collections.abc.Sequence) for lists, which breaks this function in
             # the test suite. This normalizes the value from the opts into a
-            # list if it is based on collections.Sequence.
+            # list if it is based on collections.abc.Sequence.
             back = list(back)
 
         ret = []

salt/modules/event.py

@@ -4,22 +4,19 @@
 master to the minion and vice-versa.
 """
 
-# Import Python libs
 from __future__ import absolute_import, print_function, unicode_literals
 
-import collections
 import logging
 import os
 import sys
 import traceback
+from collections.abc import Mapping
 
-# Import salt libs
 import salt.crypt
 import salt.payload
 import salt.transport.client
 import salt.utils.event
 import salt.utils.zeromq
-from salt.ext import six
 
 __proxyenabled__ = ["*"]
 log = logging.getLogger(__name__)
@@ -29,7 +26,7 @@ def _dict_subset(keys, master_dict):
     """
     Return a dictionary of only the subset of keys/values specified in keys
     """
-    return dict([(k, v) for k, v in six.iteritems(master_dict) if k in keys])
+    return dict([(k, v) for k, v in master_dict.items() if k in keys])
 
 
 def fire_master(data, tag, preload=None):
@@ -237,7 +234,7 @@ def send(
         data_dict.update(kwargs)
 
     # Allow values in the ``data`` arg to override any of the above values.
-    if isinstance(data, collections.Mapping):
+    if isinstance(data, Mapping):
         data_dict.update(data)
 
     if (

salt/modules/grains.py

@@ -10,7 +10,6 @@
    This does **NOT** override any grains set in the minion config file.
 """
 
-# Import python libs
 from __future__ import absolute_import, print_function, unicode_literals
 
 import collections
@@ -19,6 +18,7 @@
 import operator
 import os
 import random
+from collections.abc import Mapping
 from functools import reduce  # pylint: disable=redefined-builtin
 
 import salt.utils.compat
@@ -30,10 +30,6 @@
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.exceptions import SaltException
 
-# Import Salt libs
-from salt.ext import six
-from salt.ext.six.moves import range
-
 __proxyenabled__ = ["*"]
 
 # Seed the grains dict so cython will build
@@ -163,7 +159,7 @@ def items(sanitize=False):
     """
     if salt.utils.data.is_true(sanitize):
         out = dict(__grains__)
-        for key, func in six.iteritems(_SANITIZERS):
+        for key, func in _SANITIZERS.items():
             if key in out:
                 out[key] = func(out[key])
         return out
@@ -201,7 +197,7 @@ def item(*args, **kwargs):
         pass
 
     if salt.utils.data.is_true(kwargs.get("sanitize")):
-        for arg, func in six.iteritems(_SANITIZERS):
+        for arg, func in _SANITIZERS.items():
             if arg in ret:
                 ret[arg] = func(ret[arg])
     return ret
@@ -226,7 +222,7 @@ def setvals(grains, destructive=False, refresh_pillar=True):
         salt '*' grains.setvals "{'key1': 'val1', 'key2': 'val2'}"
     """
     new_grains = grains
-    if not isinstance(new_grains, collections.Mapping):
+    if not isinstance(new_grains, Mapping):
         raise SaltException("setvals grains must be a dictionary.")
     grains = {}
     if os.path.isfile(__opts__["conf_file"]):
@@ -265,7 +261,7 @@ def setvals(grains, destructive=False, refresh_pillar=True):
                 return "Unable to read existing grains file: {0}".format(exc)
         if not isinstance(grains, dict):
             grains = {}
-    for key, val in six.iteritems(new_grains):
+    for key, val in new_grains.items():
         if val is None and destructive is True:
             if key in grains:
                 del grains[key]
@@ -788,7 +784,7 @@ def equals(key, value):
         salt '*' grains.equals fqdn <expected_fqdn>
         salt '*' grains.equals systemd:version 219
     """
-    return six.text_type(value) == six.text_type(get(key))
+    return str(value) == str(get(key))
 
 
 # Provide a jinja function call compatible get aliased as fetch

salt/modules/influxdbmod.py

@@ -31,8 +31,8 @@
 
 import collections
 import logging
+from collections.abc import Sequence
 
-# Import salt libs
 import salt.utils.json
 from salt.state import STATE_INTERNAL_KEYWORDS as _STATE_INTERNAL_KEYWORDS
 
@@ -714,7 +714,7 @@ def query(database, query, **client_args):
     client = _client(**client_args)
     _result = client.query(query, database=database)
 
-    if isinstance(_result, collections.Sequence):
+    if isinstance(_result, Sequence):
         return [
             _pull_query_results(_query_result)
             for _query_result in _result

salt/modules/match.py

@@ -4,15 +4,12 @@
 """
 from __future__ import absolute_import, print_function, unicode_literals
 
-import collections
 import copy
-
-# Import python libs
 import inspect
 import logging
 import sys
+from collections.abc import Mapping
 
-# Import salt libs
 import salt.loader
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.exceptions import SaltException
@@ -358,7 +355,7 @@ def filter_by(
         params = (key, minion_id) if minion_id else (key,)
         if expr_funcs[tgt_type](*params):
             if merge:
-                if not isinstance(merge, collections.Mapping):
+                if not isinstance(merge, Mapping):
                     raise SaltException(
                         "filter_by merge argument must be a dictionary."
                     )

salt/modules/pillar.py

@@ -4,15 +4,11 @@
 """
 from __future__ import absolute_import, print_function, unicode_literals
 
-# Import python libs
-import collections
-
-# Import third party libs
 import copy
 import logging
 import os
+from collections.abc import Mapping
 
-# Import salt libs
 import salt.pillar
 import salt.utils.crypt
 import salt.utils.data
@@ -22,7 +18,6 @@
 import salt.utils.yaml
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.exceptions import CommandExecutionError
-from salt.ext import six
 
 __proxyenabled__ = ["*"]
 
@@ -148,7 +143,7 @@ def get(
             ret = salt.utils.data.traverse_dict_and_list(
                 pillar_dict, key, {}, delimiter
             )
-            if isinstance(ret, collections.Mapping):
+            if isinstance(ret, Mapping):
                 default = copy.deepcopy(default)
                 return salt.utils.dictupdate.update(
                     default, ret, merge_lists=opt_merge_lists
@@ -297,9 +292,7 @@ def _obfuscate_inner(var):
     In the special case of mapping types, keys are not obfuscated
     """
     if isinstance(var, (dict, salt.utils.odict.OrderedDict)):
-        return var.__class__(
-            (key, _obfuscate_inner(val)) for key, val in six.iteritems(var)
-        )
+        return var.__class__((key, _obfuscate_inner(val)) for key, val in var.items())
     elif isinstance(var, (list, set, tuple)):
         return type(var)(_obfuscate_inner(v) for v in var)
     else:
@@ -509,7 +502,7 @@ def ext(external, pillar=None):
         salt '*' pillar.ext "{'git': ['master https://github.com/myuser/myrepo']}"
         salt '*' pillar.ext "{'git': [{'mybranch https://github.com/myuser/myrepo': [{'env': 'base'}]}]}"
     '''
-    if isinstance(external, six.string_types):
+    if isinstance(external, str):
         external = salt.utils.yaml.safe_load(external)
     pillar_obj = salt.pillar.get_pillar(
         __opts__,