Merge branch 'develop' into saltcmd

garethgreenaway · web-flow · commit 570e53d67e38 · 2019-03-29T16:21:20.000-07:00
diff --git a/salt/utils/path.py b/salt/utils/path.py
@@ -6,7 +6,10 @@
 
 # Import python libs
 from __future__ import absolute_import, print_function, unicode_literals
-import collections
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 import errno
 import logging
 import os
@@ -301,7 +304,7 @@ def which_bin(exes):
     '''
     Scan over some possible executables and return the first one that is found
     '''
-    if not isinstance(exes, collections.Iterable):
+    if not isinstance(exes, Iterable):
         return None
     for exe in exes:
         path = which(exe)
