internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

to_text, to_bytes, and to_native now have surrogate_or_strict error handler (#4630)

Browse Source 
On python3, we want to use the surrogateescape error handler if
available for filesystem paths and the like.  On python2, have to use
strict in these circumstances.  Use the new error strategy for to_text,
to_bytes, and to_native that allows this.
This commit is contained in:
Toshio Kuratomi
2016-09-01 04:19:15 -07:00
committed by Matt Clay
parent aa0b93a338
commit 45846127c5
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/modules/source_control/git.py
View File

@@ -483,7 +483,7 @@ def get_remote_head(git_path, module, dest, version, remote, bare):
def is_remote_tag(git_path, module, dest, remote, version):
cmd = '%s ls-remote %s -t refs/tags/%s' % (git_path, remote, version)
(rc, out, err) = module.run_command(cmd, check_rc=True, cwd=dest)
if to_bytes(version) in out:
if to_bytes(version, errors='surrogate_or_strict') in out:
return True
else:
return False
@@ -513,7 +513,7 @@ def get_tags(git_path, module, dest):
def is_remote_branch(git_path, module, dest, remote, version):
cmd = '%s ls-remote %s -h refs/heads/%s' % (git_path, remote, version)
(rc, out, err) = module.run_command(cmd, check_rc=True, cwd=dest)
if to_bytes(version) in out:
if to_bytes(version, errors='surrogate_or_strict') in out:
return True
else:
return False