Mailman 3 September 2011 - Python-checkins

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/493886a640b6 changeset: 72458:493886a640b6 parent: 72455:e5dade9bf96f parent: 72457:db8027df8458 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Sep 23 13:53:06 2011 -0400 summary: merge 3.2 files: Modules/_pickle.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5318,13 +5318,12 @@ … [View More]

1 0

cpython (3.2): fix compiler compliant about \0 not being an opcode
by benjamin.peterson Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/db8027df8458 changeset: 72457:db8027df8458 branch: 3.2 parent: 72453:125887a41a6f user: Benjamin Peterson <benjamin(a)python.org> date: Fri Sep 23 13:41:41 2011 -0400 summary: fix compiler compliant about \0 not being an opcode files: Modules/_pickle.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -… [View More]

1 0

cpython (2.7): Issue #7732: Fix a crash on importing a module if a directory has the same name
by victor.stinner Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/0f5b64630fda changeset: 72456:0f5b64630fda branch: 2.7 parent: 72450:c02e790c4535 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 19:37:03 2011 +0200 summary: Issue #7732: Fix a crash on importing a module if a directory has the same name than a Python module (e.g. "__init__.py"): don't close the file twice. PyFile_FromFile() does also close the file if PyString_FromString() failed. It did already close … [View More]the file on fill_file_fields() error (e.g. if the file is a directory). files: Doc/c-api/file.rst | 3 +- Lib/test/test_import.py | 8 +++++++ Misc/NEWS | 3 ++ Objects/fileobject.c | 32 +++++++++++++++++----------- Python/import.c | 4 +-- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Doc/c-api/file.rst b/Doc/c-api/file.rst --- a/Doc/c-api/file.rst +++ b/Doc/c-api/file.rst @@ -55,7 +55,8 @@ Create a new :ctype:`PyFileObject` from the already-open standard C file pointer, *fp*. The function *close* will be called when the file should be - closed. Return *NULL* on failure. + closed. Return *NULL* and close the file using *close* on failure. + *close* is optional and can be set to *NULL*. .. cfunction:: FILE* PyFile_AsFile(PyObject \*p) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -265,6 +265,14 @@ """)) script_helper.assert_python_ok(testfn) + def test_bug7732(self): + source = TESTFN + '.py' + os.mkdir(source) + try: + self.assertRaises(IOError, imp.find_module, TESTFN, ["."]) + finally: + os.rmdir(source) + class PycRewritingTests(unittest.TestCase): # Test that the `co_filename` attribute on code objects always points diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #7732: Fix a crash on importing a module if a directory has the same + name than a Python module (e.g. "__init__.py"): don't close the file twice. + - Issue #12973: Fix overflow checks that invoked undefined behaviour in int.__pow__. These overflow checks were causing int.__pow__ to produce incorrect results with recent versions of Clang, as a result of the diff --git a/Objects/fileobject.c b/Objects/fileobject.c --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -468,28 +468,34 @@ PyObject * PyFile_FromFile(FILE *fp, char *name, char *mode, int (*close)(FILE *)) { - PyFileObject *f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type, - NULL, NULL); - if (f != NULL) { - PyObject *o_name = PyString_FromString(name); - if (o_name == NULL) - return NULL; - if (fill_file_fields(f, fp, o_name, mode, close) == NULL) { - Py_DECREF(f); - f = NULL; - } + PyFileObject *f; + PyObject *o_name; + + f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type, NULL, NULL); + if (f == NULL) + return NULL; + o_name = PyString_FromString(name); + if (o_name == NULL) { + if (close != NULL && fp != NULL) + close(fp); + Py_DECREF(f); + return NULL; + } + if (fill_file_fields(f, fp, o_name, mode, close) == NULL) { + Py_DECREF(f); Py_DECREF(o_name); + return NULL; } - return (PyObject *) f; + Py_DECREF(o_name); + return (PyObject *)f; } PyObject * PyFile_FromString(char *name, char *mode) { - extern int fclose(FILE *); PyFileObject *f; - f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, fclose); + f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, NULL); if (f != NULL) { if (open_the_file(f, name, mode) == NULL) { Py_DECREF(f); diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -2845,10 +2845,8 @@ return NULL; if (fp != NULL) { fob = PyFile_FromFile(fp, pathname, fdp->mode, fclose); - if (fob == NULL) { - fclose(fp); + if (fob == NULL) return NULL; - } } else { fob = Py_None; -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: disable unused result warnings when possible
by benjamin.peterson Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/e5dade9bf96f changeset: 72455:e5dade9bf96f user: Benjamin Peterson <benjamin(a)python.org> date: Fri Sep 23 13:23:22 2011 -0400 summary: disable unused result warnings when possible files: configure | 43 ++++++++++++++++++++++++++++++++++++++++ configure.in | 22 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/configure b/configure --- a/configure +++ b/configure @@ -5561,6 +5561,49 @@ … [View More] BASECFLAGS="$BASECFLAGS -fno-strict-aliasing" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused result warning" >&5 +$as_echo_n "checking if we can turn off $CC unused result warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wunused-result -Werror" + save_CFLAGS="$CFLAGS" + if ${ac_cv_disable_unused_result_warning+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_disable_unused_result_warning=yes + +else + + ac_cv_disable_unused_result_warning=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + CFLAGS="$save_CFLAGS" + CC="$ac_save_cc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5 +$as_echo "$ac_cv_disable_unused_result_warning" >&6; } + + if test $ac_cv_disable_unused_result_warning = yes + then + BASECFLAGS="$BASECFLAGS -Wno-unused-result" + fi + # if using gcc on alpha, use -mieee to get (near) full IEEE 754 # support. Without this, treatment of subnormals doesn't follow # the standard. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -981,6 +981,28 @@ BASECFLAGS="$BASECFLAGS -fno-strict-aliasing" fi + AC_MSG_CHECKING(if we can turn off $CC unused result warning) + ac_save_cc="$CC" + CC="$CC -Wunused-result -Werror" + save_CFLAGS="$CFLAGS" + AC_CACHE_VAL(ac_cv_disable_unused_result_warning, + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[]], [[]]) + ],[ + ac_cv_disable_unused_result_warning=yes + ],[ + ac_cv_disable_unused_result_warning=no + ])) + CFLAGS="$save_CFLAGS" + CC="$ac_save_cc" + AC_MSG_RESULT($ac_cv_disable_unused_result_warning) + + if test $ac_cv_disable_unused_result_warning = yes + then + BASECFLAGS="$BASECFLAGS -Wno-unused-result" + fi + # if using gcc on alpha, use -mieee to get (near) full IEEE 754 # support. Without this, treatment of subnormals doesn't follow # the standard. -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (3.2): Issue #7732: Don't open a directory as a file anymore while importing a
by victor.stinner Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/125887a41a6f changeset: 72453:125887a41a6f branch: 3.2 parent: 72451:5ceab07bcd02 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 18:54:40 2011 +0200 summary: Issue #7732: Don't open a directory as a file anymore while importing a module. Ignore the direcotry if its name matchs the module name (e.g. "__init__.py") and raise a ImportError instead. files: Lib/test/test_import.py | 9 +++++++++ Misc/NEWS … [View More] | 6 +++++- Python/import.c | 9 ++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -139,6 +139,15 @@ self.assertIs(orig_path, new_os.path) self.assertIsNot(orig_getenv, new_os.getenv) + def test_bug7732(self): + source = TESTFN + '.py' + os.mkdir(source) + try: + self.assertRaisesRegex(ImportError, '^No module', + imp.find_module, TESTFN, ["."]) + finally: + os.rmdir(source) + def test_module_with_large_stack(self, module='longlist'): # Regression test for http://bugs.python.org/issue561858. filename = module + '.py' diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + - Issue #13021: Missing decref on an error path. Thanks to Suman Saha for finding the bug and providing a patch. @@ -77,7 +81,7 @@ Extension Modules ----------------- - + - Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that file descriptor was actually received. diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1763,6 +1763,7 @@ saved_namelen = namelen; #endif /* PYOS_OS2 */ for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) { + struct stat statbuf; #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING) /* OS/2 limits DLLs to 8 character names (w/o extension) @@ -1791,10 +1792,16 @@ strcpy(buf+len, fdp->suffix); if (Py_VerboseFlag > 1) PySys_WriteStderr("# trying %s\n", buf); + filemode = fdp->mode; if (filemode[0] == 'U') filemode = "r" PY_STDIOTEXTMODE; - fp = fopen(buf, filemode); + + if (stat(buf, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) + /* it's a directory */ + fp = NULL; + else + fp = fopen(buf, filemode); if (fp != NULL) { if (case_ok(buf, len, namelen, name)) break; -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.2 -> default): Merge 3.2: Issue #7732: Don't open a directory as a file anymore while
by victor.stinner Sept. 23, 2011

Sept. 23, 2011

http://hg.python.org/cpython/rev/8c6fea5794b2 changeset: 72454:8c6fea5794b2 parent: 72452:3b46f2e2d280 parent: 72453:125887a41a6f user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 18:59:08 2011 +0200 summary: Merge 3.2: Issue #7732: Don't open a directory as a file anymore while importing a module. Ignore the direcotry if its name matchs the module name (e.g. "__init__.py") and raise a ImportError instead. files: Lib/test/test_import.py … [View More]| 9 +++++++++ Misc/NEWS | 6 +++++- Python/import.c | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -139,6 +139,15 @@ self.assertIs(orig_path, new_os.path) self.assertIsNot(orig_getenv, new_os.getenv) + def test_bug7732(self): + source = TESTFN + '.py' + os.mkdir(source) + try: + self.assertRaisesRegex(ImportError, '^No module', + imp.find_module, TESTFN, ["."]) + finally: + os.rmdir(source) + def test_module_with_large_stack(self, module='longlist'): # Regression test for http://bugs.python.org/issue561858. filename = module + '.py' diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #7732: Don't open a directory as a file anymore while importing a + module. Ignore the direcotry if its name matchs the module name (e.g. + "__init__.py") and raise a ImportError instead. + - Issue #13021: Missing decref on an error path. Thanks to Suman Saha for finding the bug and providing a patch. @@ -291,7 +295,7 @@ ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff. - Issue #12959: Add collections.ChainMap to collections.__all__. - + - Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or Download-URL field is present. diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1892,6 +1892,8 @@ } for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) { + struct stat statbuf; + filemode = fdp->mode; if (filemode[0] == 'U') filemode = "r" PY_STDIOTEXTMODE; @@ -1905,6 +1907,13 @@ if (Py_VerboseFlag > 1) PySys_FormatStderr("# trying %R\n", filename); + if (_Py_stat(filename, &statbuf) == 0 && /* it exists */ + S_ISDIR(statbuf.st_mode)) /* it's a directory */ + { + Py_DECREF(filename); + continue; + } + fp = _Py_fopen(filename, filemode); if (fp == NULL) { Py_DECREF(filename); -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

Daily reference leaks (3b46f2e2d280): sum=0
by solipsis＠pitrou.net Sept. 22, 2011

Sept. 22, 2011

results for 3b46f2e2d280 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogdBxCiw', '-x']

1 0

cpython (merge 3.2 -> default): Merge 3.2: Issue #12931: Add a test with Unicode URI to test_xmlrpc
by victor.stinner Sept. 22, 2011

Sept. 22, 2011

http://hg.python.org/cpython/rev/3b46f2e2d280 changeset: 72452:3b46f2e2d280 parent: 72449:a06ef7ab7321 parent: 72451:5ceab07bcd02 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 01:31:04 2011 +0200 summary: Merge 3.2: Issue #12931: Add a test with Unicode URI to test_xmlrpc files: Lib/test/test_xmlrpc.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py --- a/… [View More]

1 0

cpython (3.2): Issue #12931: Add a test with Unicode URI to test_xmlrpc
by victor.stinner Sept. 22, 2011

Sept. 22, 2011

http://hg.python.org/cpython/rev/5ceab07bcd02 changeset: 72451:5ceab07bcd02 branch: 3.2 parent: 72448:aa4b9ed71538 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 01:29:44 2011 +0200 summary: Issue #12931: Add a test with Unicode URI to test_xmlrpc files: Lib/test/test_xmlrpc.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py --- a/Lib/test/test_xmlrpc.py +++ … [View More]

1 0

cpython (2.7): Issue #12931: xmlrpclib now encodes Unicode URI to ISO-8859-1, instead of
by victor.stinner Sept. 22, 2011

Sept. 22, 2011

http://hg.python.org/cpython/rev/c02e790c4535 changeset: 72450:c02e790c4535 branch: 2.7 parent: 72447:93a5388a3721 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Fri Sep 23 01:15:32 2011 +0200 summary: Issue #12931: xmlrpclib now encodes Unicode URI to ISO-8859-1, instead of failing with a UnicodeDecodeError. files: Lib/test/test_xmlrpc.py | 3 +++ Lib/xmlrpclib.py | 3 +++ Misc/NEWS | 3 +++ 3 files changed, 9 … [View More]

1 0