valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20431 from SmithSamuelM/sam_20150124

Browse Source 
Changed test from str to basestring
This commit is contained in:
Thomas S Hatch 2015-02-05 14:09:14 -07:00
commit ef3fd7ce90
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/minion.py
View File

@ -2442,7 +2442,7 @@ class Matcher(object):
'''
Returns true if the passed glob matches the id
'''
if not isinstance(tgt, str):
if not isinstance(tgt, basestring):
return False
return fnmatch.fnmatch(self.opts['id'], tgt)