From 7443479c9261b893d00c923bf53d924bbae9bc64 Mon Sep 17 00:00:00 2001
From: Aki Sukegawa <nsukeg@gmail.com>
Date: Wed, 2 Nov 2016 13:54:02 +0900
Subject: [PATCH] Consistently use bytes for git version tracking for Python3
compatibility (#5318)
---
tensorflow/tools/git/gen_git_source.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
index 267bcad816b..adc6bdbd17e 100755
--- a/tensorflow/tools/git/gen_git_source.py
+++ b/tensorflow/tools/git/gen_git_source.py
@@ -147,8 +147,10 @@ def get_git_version(git_base_path):
"""
unknown_label = b"unknown"
try:
- val = subprocess.check_output(["git", str("--git-dir="+git_base_path+"/.git"), str("--work-tree="+git_base_path), "describe",
- "--long", "--dirty", "--tags"]).strip()
+ val = bytes(subprocess.check_output([
+ "git", str("--git-dir=%s/.git" % git_base_path),
+ str("--work-tree=" + git_base_path), "describe", "--long", "--dirty", "--tags"
+ ]).strip())
return val if val else unknown_label
except subprocess.CalledProcessError:
return unknown_label
@@ -199,7 +201,7 @@ def generate(arglist):
data = json.load(open(spec))
git_version = None
if not data["git"]:
- git_version = "unknown"
+ git_version = b"unknown"
else:
old_branch = data["branch"]
new_branch = parse_branch_ref(head_symlink)