From: Phil Holmes <mail@philholmes.net>
Date: Sat, 18 Aug 2012 13:23:25 +0000 (+0100)
Subject: Removes popen3 deprecated warning
X-Git-Tag: release/2.17.0-1~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a717cd92bdd69fda8e830a80f3f644d6185d9de;p=lilypond.git

Removes popen3 deprecated warning
---

diff --git a/python/book_snippets.py b/python/book_snippets.py
index f3a11ccca9..69fdc4fa68 100644
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -7,11 +7,8 @@ import re
 import os
 import copy
 import shutil
-# TODO: We are using os.popen3, which has been deprecated since python 2.6. The
-# suggested replacement is the Popen function of the subprocess module.
-# Unfortunately, on windows this needs the msvcrt module, which doesn't seem
-# to be available in GUB?!?!?!
-# from subprocess import Popen, PIPE
+import subprocess
+import sys
 
 progress = ly.progress
 warning = ly.warning
@@ -740,10 +737,11 @@ printing diff against existing file." % filename)
 
         debug (_ ("Running through filter `%s'") % cmd, True)
 
-        # TODO: Use Popen once we resolve the problem with msvcrt in Windows:
-        (stdin, stdout, stderr) = os.popen3 (cmd)
-        # p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
-        # (stdin, stdout, stderr) = (p.stdin, p.stdout, p.stderr)
+        closefds = True
+        if (sys.platform == "mingw32"):
+            closefds = False
+        p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=closefds)
+        (stdin, stdout, stderr) = (p.stdin, p.stdout, p.stderr)
         stdin.write (input)
         status = stdin.close ()