bpo-36814: ensure os.posix_spawn() handles None (GH-13144)

tonybaloney · vstinner · commit 948ed8c96b69 · 2019-05-10T04:00:06.000+02:00
Fix an issue where os.posix_spawn() would incorrectly raise a TypeError
when file_actions is None.
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
@@ -1550,6 +1550,15 @@ def test_specify_environment(self):
         with open(envfile) as f:
             self.assertEqual(f.read(), 'bar')
 
+    def test_none_file_actions(self):
+        pid = self.spawn_func(
+            self.NOOP_PROGRAM[0],
+            self.NOOP_PROGRAM,
+            os.environ,
+            file_actions=None
+        )
+        self.assertEqual(os.waitpid(pid, 0), (pid, 0))
+
     def test_empty_file_actions(self):
         pid = self.spawn_func(
             self.NOOP_PROGRAM[0],
diff --git a/Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst b/Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst
@@ -0,0 +1 @@
+Fix an issue where os.posix_spawnp() would incorrectly raise a TypeError when file_actions is None.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -5465,7 +5465,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a
         goto exit;
     }
 
-    if (file_actions != NULL) {
+    if (file_actions != NULL && file_actions != Py_None) {
         /* There is a bug in old versions of glibc that makes some of the
          * helper functions for manipulating file actions not copy the provided
          * buffers. The problem is that posix_spawn_file_actions_addopen does not

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix an issue where os.posix_spawnp() would incorrectly raise a TypeError when file_actions is None.`
Original file line number	Diff line number	Diff line change
`@@ -5465,7 +5465,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject module, path_t path, PyObject *a`
`5465`	`5465`	`goto exit;`
`5466`	`5466`	`}`
`5467`	`5467`
`5468`		`- if (file_actions != NULL) {`
	`5468`	`+ if (file_actions != NULL && file_actions != Py_None) {`
`5469`	`5469`	`/* There is a bug in old versions of glibc that makes some of the`
`5470`	`5470`	`* helper functions for manipulating file actions not copy the provided`
`5471`	`5471`	`* buffers. The problem is that posix_spawn_file_actions_addopen does not`