From: Enrico Forestieri <forenr@lyx.org>
Date: Fri, 17 Aug 2018 20:28:03 +0000 (+0200)
Subject: Fix bug #11247
X-Git-Tag: 2.3.1~21
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=103d6c6362f5e2b373f306b7f7f05bb555c2f6a2;p=features.git

Fix bug #11247

async is a reserved keyword in python 3.7

(cherry picked from commit 061cd7fd9ca002c8935dbb6cd5b19c2725c3f1f5)
---

diff --git a/lib/configure.py b/lib/configure.py
index 7bfac3d135..f0efb0fe66 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -64,10 +64,10 @@ def removeFiles(filenames):
             pass
 
 
-def cmdOutput(cmd, async = False):
+def cmdOutput(cmd, asynchronous = False):
     '''utility function: run a command and get its output as a string
         cmd: command to run
-        async: if False, return whole output as a string, otherwise
+        asynchronous: if False, return whole output as a string, otherwise
                return the stdout handle from which the output can be
                read (the caller is then responsible for closing it)
     '''
@@ -82,7 +82,7 @@ def cmdOutput(cmd, async = False):
     pipe = subprocess.Popen(cmd, shell=b, close_fds=b, stdin=subprocess.PIPE,
                             stdout=subprocess.PIPE, universal_newlines=True)
     pipe.stdin.close()
-    if async:
+    if asynchronous:
         return pipe.stdout
     output = pipe.stdout.read()
     pipe.stdout.close()
diff --git a/status.23x b/status.23x
index 7241291732..e7b3b20dc2 100644
--- a/status.23x
+++ b/status.23x
@@ -301,6 +301,8 @@ What's new
 
 - Fix the LyX server on Windows so that replies are actually output.
 
+- Fix the configure.py script for python 3.7.
+
 
 * DOCUMENTATION AND LOCALIZATION