From 1f4dbd6069e15d7f8d5cfb95e79821cf26badd92 Mon Sep 17 00:00:00 2001
From: plasky <paul.lasky@monash.edu>
Date: Tue, 15 May 2018 16:20:54 +1000
Subject: [PATCH] added unicode statements to setup.py for python3 and 2
support
---
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index d6ebf3b74..f63a85f37 100644
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,9 @@ from distutils.core import setup
import subprocess
# Write a version file containing the git hash and info
-git_log = subprocess.check_output(['git', 'log', '-1', '--pretty=%h %ai'])
+git_log = subprocess.check_output(['git', 'log', '-1', '--pretty=%h %ai']).decode('utf-8')
git_diff = (subprocess.check_output(['git', 'diff', '.'])
- + subprocess.check_output(['git', 'diff', '--cached', '.']))
+ + subprocess.check_output(['git', 'diff', '--cached', '.'])).decode('utf-8')
if git_diff == '':
status = '(CLEAN) ' + git_log
else:
--
GitLab