Handle Python3 bytes vs. str in Git.__compute_extra_version

This commit is contained in:
Kp 2018-08-24 02:58:21 +00:00
parent 746b61da8d
commit 92cc4bd4ff

View file

@ -196,10 +196,10 @@ class Git(StaticSubprocess):
if g.returncode:
return None
_pcall = cls.pcall
return (g.out.split('\n')[0] + \
('*' if _pcall(['diff', '--quiet']).returncode else '') + \
('+' if _pcall(['diff', '--quiet', '--cached']).returncode else '')
)
return (g.out.splitlines()[0] + \
(b'*' if _pcall(['diff', '--quiet']).returncode else b'') + \
(b'+' if _pcall(['diff', '--quiet', '--cached']).returncode else b'')
).decode()
class _ConfigureTests:
class Collector(object):