aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2023-05-23 20:25:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-05-23 20:25:36 +0000
commit9fdf0a6156cd9d3d5824bd8f422d395abdd6f2fc (patch)
treee5b31248f02716deeebd924216f0cb99e124f8a8
parent5aa136b129a5357234d20efd5eded60a1ddd3b79 (diff)
parent309aff722de411015ce33ff7395a7d522456ac3c (diff)
downloadninja-9fdf0a6156cd9d3d5824bd8f422d395abdd6f2fc.tar.gz
Merge "Python 3 fxies."
-rwxr-xr-xconfigure.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.py b/configure.py
index 6c0acda..ed3657d 100755
--- a/configure.py
+++ b/configure.py
@@ -493,7 +493,7 @@ n.newline()
n.comment('the proto descriptor is generated using protoc.')
def has_protoc():
try:
- proc = subprocess.Popen(['protoc', '--version'], stdout=subprocess.PIPE)
+ proc = subprocess.Popen(['protoc', '--version'], stdout=subprocess.PIPE, text=True)
return proc.communicate()[0].startswith("libprotoc")
except OSError:
return False
@@ -501,7 +501,7 @@ def has_protoc():
def can_generate_proto_header():
try:
tool = os.path.join(sourcedir, 'misc', 'generate_proto_header.py')
- proc = subprocess.Popen([tool, '--probe'], stdout=subprocess.PIPE)
+ proc = subprocess.Popen([tool, '--probe'], stdout=subprocess.PIPE, text=True)
return proc.communicate()[0].startswith("ok")
except OSError:
return False