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

Fix unicode reqs for search system

Browse Source
This commit is contained in:
Thomas S Hatch 2012-11-20 23:52:11 -07:00
parent 360e137e89
commit 129c521fcc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/search/__init__.py
View File

@ -50,15 +50,15 @@ def _iter_dir(dir_, env):
with open(path) as fp_:
if salt.utils.istextfile(fp_):
ret.append(
{'path': path,
'env': env,
'content': fp_.read()}
{'path': unicode(path),
'env': unicode(env),
'content': unicode(fp_.read())}
)
else:
ret.append(
{'path': path,
'env': env,
'content': 'bin'}
{'path': unicode(path),
'env': unicode(env),
'content': u'bin'}
)
yield ret
@ -72,6 +72,8 @@ def iter_roots(roots):
'''
for env, dirs in roots.items():
for dir_ in dirs:
if not os.path.isdir(dir_):
continue
for ret in _iter_dir(dir_, env):
yield ret