From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 31 Oct 2003 10:01:53 +0000 (+0000)
Subject: Patch #788404: ignore "b" and "t" mode modifiers in posix_popen.
X-Git-Tag: v2.4a1~1344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ad853bc371e420b20dacbfe00af9da2ba5d3b6d;p=python

Patch #788404: ignore "b" and "t" mode modifiers in posix_popen.
Fixes #703198. Backported to 2.3.
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index a882023394..9c58c9d686 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4348,6 +4348,11 @@ posix_popen(PyObject *self, PyObject *args)
 	PyObject *f;
 	if (!PyArg_ParseTuple(args, "s|si:popen", &name, &mode, &bufsize))
 		return NULL;
+	/* Strip mode of binary or text modifiers */
+	if (strcmp(mode, "rb") == 0 || strcmp(mode, "rt") == 0)
+		mode = "r";
+	else if (strcmp(mode, "wb") == 0 || strcmp(mode, "wt") == 0)
+		mode = "w";
 	Py_BEGIN_ALLOW_THREADS
 	fp = popen(name, mode);
 	Py_END_ALLOW_THREADS