Merge pull request #1485 from rstudio/Popen-on-windows-revisited

hand-roll wrapper for `Popen.__init__`
rstudio · Sep 20, 2023 · d5b014b · d5b014b
2 parents 9cc31aa + f2e06f0
commit d5b014b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: reticulate
 Type: Package
 Title: Interface to 'Python'
-Version: 1.32.0.9001
+Version: 1.32.0.9002
 Authors@R: c(
   person("Tomasz", "Kalinowski", role = c("ctb", "cre"),
          email = "tomasz@posit.co"),

diff --git a/inst/python/rpytools/subprocess.py b/inst/python/rpytools/subprocess.py
@@ -3,7 +3,15 @@
 
 
 def patch_subprocess_Popen():
-    from subprocess import Popen, DEVNULL
-    from functools import partialmethod
+    from functools import wraps
+    import subprocess
 
-    Popen.__init__ = partialmethod(Popen.__init__, stdin=DEVNULL)
+    og_Popen__init__ = subprocess.Popen.__init__
+
+    @wraps(subprocess.Popen.__init__)
+    def __init__(self, *args, **kwargs):
+        if kwargs.get("stdin") is None:
+            kwargs["stdin"] = subprocess.DEVNULL
+        return og_Popen__init__(self, *args, **kwargs)
+
+    subprocess.Popen.__init__ = __init__