From b5e152e8cf621fc0422f0627fa18e7815fd4d7b7 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 26 Jun 2011 12:19:43 -0400
Subject: [PATCH] Python 3 fixes for aksetup.
---
aksetup_helper.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/aksetup_helper.py b/aksetup_helper.py
index afc6cb95..9c6c1d39 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -699,7 +699,7 @@ def check_git_submodules():
stdout_data, _ = popen.communicate()
if popen.returncode != 0:
git_error = "git returned error code %d" % popen.returncode
- except OSError, e:
+ except OSError as e:
git_error = e
if git_error is not None:
@@ -718,6 +718,7 @@ def check_git_submodules():
popen = Popen(["git", "submodule", "status"], stdout=PIPE)
stdout_data, _ = popen.communicate()
+ stdout_data = stdout_data.decode("ascii")
if popen.returncode != 0:
git_error = "git returned error code %d" % popen.returncode
--
GitLab