From 5e2c5fa1bd9f0ed602ce2977c7c6772433c8de4d Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 30 May 2002 17:33:07 +0000 Subject: imp_load_module(): correct and comment the sense of the test for '+' in the mode (it's forbidden). --- Python/import.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Python/import.c b/Python/import.c index 112f7f6..8c9cd2f 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2408,11 +2408,16 @@ imp_load_module(PyObject *self, PyObject *args) &name, &fob, &pathname, &suffix, &mode, &type)) return NULL; - if (*mode && - !(*mode == 'r' || *mode == 'U' || strchr(mode, '+'))) { + if (*mode) { + /* Mode must start with 'r' or 'U' and must not contain '+'. + Implicit in this test is the assumption that the mode + may contain other modifiers like 'b' or 't'. */ + + if (!(*mode == 'r' || *mode == 'U') || strchr(mode, '+')) { PyErr_Format(PyExc_ValueError, "invalid file open mode %.200s", mode); return NULL; + } } if (fob == Py_None) fp = NULL; -- cgit v0.12