saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't use six.text_type() in salt.utils.gitfs

Browse source 
For Python 2, Pygit2 (as well as others) store unicode strings as bytes
(e.g. ``'\xd0\x94'``), not as unicode strings. This can result in a
``UnicodeDecodeError`` being raised when ``os.path.join()`` is invoked
and Python attempts to decode the bytestring.

This commit fixes the issue by using ``str()`` to force config values to
be strings, rather than ``six.text_type()``.

Resolves #35630.
This commit is contained in:
Erik Johnson 2016-08-22 20:21:32 -05:00
parent fd08d33597
commit d76659a63a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/gitfs.py
View file

@ -153,7 +153,7 @@ class GitProvider(object):
self.id = next(iter(remote))
self.get_url()
per_remote_conf = dict(
[(key, six.text_type(val)) for key, val in
[(key, str(val)) for key, val in
six.iteritems(salt.utils.repack_dictlist(remote[self.id]))]
)
if not per_remote_conf:
@ -2016,7 +2016,7 @@ class GitBase(object):
'a bug, please report it.'.format(key)
)
failhard(self.role)
per_remote_defaults[param] = six.text_type(self.opts[key])
per_remote_defaults[param] = str(self.opts[key])
self.remotes = []
for remote in remotes:
@ -2132,7 +2132,7 @@ class GitBase(object):
continue
except TypeError:
# remote was non-string, try again
if not fnmatch.fnmatch(repo.url, six.text_type(remote)):
if not fnmatch.fnmatch(repo.url, str(remote)):
continue
success, failed = repo.clear_lock(lock_type=lock_type)
cleared.extend(success)
@ -2177,7 +2177,7 @@ class GitBase(object):
continue
except TypeError:
# remote was non-string, try again
if not fnmatch.fnmatch(repo.url, six.text_type(remote)):
if not fnmatch.fnmatch(repo.url, str(remote)):
continue
success, failed = repo.lock()
locked.extend(success)