Fix decode error for Python 3
This commit is contained in:
parent
f76515ccce
commit
8b79fb6797
|
@ -42,7 +42,7 @@ def call_git_describe():
|
||||||
stdout=PIPE, stderr=PIPE)
|
stdout=PIPE, stderr=PIPE)
|
||||||
p.stderr.close()
|
p.stderr.close()
|
||||||
line = p.stdout.readlines()[0]
|
line = p.stdout.readlines()[0]
|
||||||
return line.strip()
|
return line.strip().decode('utf-8')
|
||||||
|
|
||||||
except:
|
except:
|
||||||
return None
|
return None
|
||||||
|
@ -96,8 +96,7 @@ def get_git_version():
|
||||||
write_release_version(version)
|
write_release_version(version)
|
||||||
|
|
||||||
# Finally, return the current version.
|
# Finally, return the current version.
|
||||||
|
return version[1:]
|
||||||
return version[1:].decode('utf-8')
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Loading…
Reference in New Issue