Skip to content

Commit

Permalink
Merge pull request #54608 from garethgreenaway/2019_2_1_port_52304
Browse files Browse the repository at this point in the history
[master] Porting #52304 to master
  • Loading branch information
dwoz authored Dec 14, 2019
2 parents 8d8e4cf + 47a76e6 commit 249b52b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions salt/utils/path.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -262,7 +265,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)
Expand Down

0 comments on commit 249b52b

Please sign in to comment.