Mailman 3 November 2010 - Python-checkins

r86813 - in python/branches/release27-maint: Doc/library/bdb.rst Doc/tutorial/stdlib.rst Doc/whatsnew/2.7.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 19:26:04 2010 New Revision: 86813 Log: Merged revisions 86794,86798,86801 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86794 | georg.brandl | 2010-11-26 12:50:13 +0100 (Fr, 26 Nov 2010) | 1 line #10526: fix typo. ........ r86798 | georg.brandl | 2010-11-26 13:05:48 +0100 (Fr, 26 Nov 2010) | 1 line #10420: fix docs of bdb.effective(). ........ r86801 | georg.brandl | 2010-11-26 13:12:14 +0100 (Fr, 26 Nov 2010) | 1 line Better example for os.system(): do not change the system time. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Doc/library/bdb.rst python/branches/release27-maint/Doc/tutorial/stdlib.rst python/branches/release27-maint/Doc/whatsnew/2.7.rst Modified: python/branches/release27-maint/Doc/library/bdb.rst ============================================================================== --- python/branches/release27-maint/Doc/library/bdb.rst (original) +++ python/branches/release27-maint/Doc/library/bdb.rst Fri Nov 26 19:26:04 2010 @@ -342,12 +342,10 @@ .. function:: effective(file, line, frame) Determine if there is an effective (active) breakpoint at this line of code. - Return breakpoint number or 0 if none. - - Called only if we know there is a breakpoint at this location. Returns the - breakpoint that was triggered and a flag that indicates if it is ok to delete - a temporary breakpoint. + Return a tuple of the breakpoint and a boolean that indicates if it is ok + to delete a temporary breakpoint. Return ``(None, None)`` if there is no + matching breakpoint. .. function:: set_trace() - Starts debugging with a :class:`Bdb` instance from caller's frame. + Start debugging with a :class:`Bdb` instance from caller's frame. Modified: python/branches/release27-maint/Doc/tutorial/stdlib.rst ============================================================================== --- python/branches/release27-maint/Doc/tutorial/stdlib.rst (original) +++ python/branches/release27-maint/Doc/tutorial/stdlib.rst Fri Nov 26 19:26:04 2010 @@ -14,11 +14,11 @@ operating system:: >>> import os - >>> os.system('time 0:02') - 0 >>> os.getcwd() # Return the current working directory 'C:\\Python26' - >>> os.chdir('/server/accesslogs') + >>> os.chdir('/server/accesslogs') # Change current working directory + >>> os.system('mkdir today') # Run the command mkdir in the system shell + 0 Be sure to use the ``import os`` style instead of ``from os import *``. This will keep :func:`os.open` from shadowing the built-in :func:`open` function which Modified: python/branches/release27-maint/Doc/whatsnew/2.7.rst ============================================================================== --- python/branches/release27-maint/Doc/whatsnew/2.7.rst (original) +++ python/branches/release27-maint/Doc/whatsnew/2.7.rst Fri Nov 26 19:26:04 2010 @@ -244,7 +244,7 @@ modules. * The :mod:`ConfigParser` module uses them by default, meaning that - configuration files can now read, modified, and then written back + configuration files can now be read, modified, and then written back in their original order. * The :meth:`~collections.somenamedtuple._asdict()` method for

1 0

r86812 - in python/branches/release27-maint: Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 18:35:50 2010 New Revision: 86812 Log: Merged revisions 86808 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86808 | stefan.krah | 2010-11-26 17:16:47 +0100 (Fri, 26 Nov 2010) | 1 line Further indentation cleanup. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Modules/posixmodule.c Modified: python/branches/release27-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release27-maint/Modules/posixmodule.c (original) +++ python/branches/release27-maint/Modules/posixmodule.c Fri Nov 26 18:35:50 2010 @@ -1852,7 +1852,7 @@ static PyObject * posix_fsync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fsync); + return posix_fildes(fdobj, fsync); } #endif /* HAVE_FSYNC */ @@ -1870,7 +1870,7 @@ static PyObject * posix_fdatasync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fdatasync); + return posix_fildes(fdobj, fdatasync); } #endif /* HAVE_FDATASYNC */ @@ -2812,7 +2812,7 @@ !SystemTimeToFileTime(&now, &atime)) { win32_error("utime", NULL); goto done; - } + } } else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) { PyErr_SetString(PyExc_TypeError, @@ -3934,9 +3934,9 @@ for (i = 0; i < n; ++i) { PyObject *o = PyInt_FromLong((long)alt_grouplist[i]); if (o == NULL) { - Py_DECREF(result); - result = NULL; - break; + Py_DECREF(result); + result = NULL; + break; } PyList_SET_ITEM(result, i, o); } @@ -7385,33 +7385,33 @@ size_t tablesize) { if (PyInt_Check(arg)) { - *valuep = PyInt_AS_LONG(arg); - return 1; + *valuep = PyInt_AS_LONG(arg); + return 1; } if (PyString_Check(arg)) { - /* look up the value in the table using a binary search */ - size_t lo = 0; + /* look up the value in the table using a binary search */ + size_t lo = 0; size_t mid; - size_t hi = tablesize; - int cmp; - char *confname = PyString_AS_STRING(arg); - while (lo < hi) { - mid = (lo + hi) / 2; - cmp = strcmp(confname, table[mid].name); - if (cmp < 0) - hi = mid; - else if (cmp > 0) - lo = mid + 1; - else { - *valuep = table[mid].value; - return 1; + size_t hi = tablesize; + int cmp; + char *confname = PyString_AS_STRING(arg); + while (lo < hi) { + mid = (lo + hi) / 2; + cmp = strcmp(confname, table[mid].name); + if (cmp < 0) + hi = mid; + else if (cmp > 0) + lo = mid + 1; + else { + *valuep = table[mid].value; + return 1; + } } - } - PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); + PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); } else - PyErr_SetString(PyExc_TypeError, - "configuration names must be strings or integers"); + PyErr_SetString(PyExc_TypeError, + "configuration names must be strings or integers"); return 0; } @@ -7494,14 +7494,14 @@ if (PyArg_ParseTuple(args, "iO&:fpathconf", &fd, conv_path_confname, &name)) { - long limit; + long limit; - errno = 0; - limit = fpathconf(fd, name); - if (limit == -1 && errno != 0) - posix_error(); - else - result = PyInt_FromLong(limit); + errno = 0; + limit = fpathconf(fd, name); + if (limit == -1 && errno != 0) + posix_error(); + else + result = PyInt_FromLong(limit); } return result; } @@ -8320,21 +8320,21 @@ sizeof(posix_constants_pathconf) / sizeof(struct constdef), "pathconf_names", module)) - return -1; + return -1; #endif #ifdef HAVE_CONFSTR if (setup_confname_table(posix_constants_confstr, sizeof(posix_constants_confstr) / sizeof(struct constdef), "confstr_names", module)) - return -1; + return -1; #endif #ifdef HAVE_SYSCONF if (setup_confname_table(posix_constants_sysconf, sizeof(posix_constants_sysconf) / sizeof(struct constdef), "sysconf_names", module)) - return -1; + return -1; #endif return 0; } @@ -8445,10 +8445,10 @@ { double loadavg[3]; if (getloadavg(loadavg, 3)!=3) { - PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); - return NULL; + PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); + return NULL; } else - return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); + return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); } #endif

1 0

r86811 - python/branches/py3k-stat-on-windows/Tools/buildbot/test.bat
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 18:29:05 2010 New Revision: 86811 Log: Skip test_ttk_guionly. Modified: python/branches/py3k-stat-on-windows/Tools/buildbot/test.bat Modified: python/branches/py3k-stat-on-windows/Tools/buildbot/test.bat ============================================================================== --- python/branches/py3k-stat-on-windows/Tools/buildbot/test.bat (original) +++ python/branches/py3k-stat-on-windows/Tools/buildbot/test.bat Fri Nov 26 18:29:05 2010 @@ -1,4 +1,4 @@ @rem Used by the buildbot "test" step. cd PCbuild -call rt.bat -d -q -uall -rw -n +call rt.bat -d -q -uall -rw -n -x test_ttk_guionly

1 0

r86810 - in python/branches/release31-maint: Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 18:04:40 2010 New Revision: 86810 Log: Merged revisions 86808 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86808 | stefan.krah | 2010-11-26 17:16:47 +0100 (Fri, 26 Nov 2010) | 1 line Further indentation cleanup. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Modules/posixmodule.c Modified: python/branches/release31-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release31-maint/Modules/posixmodule.c (original) +++ python/branches/release31-maint/Modules/posixmodule.c Fri Nov 26 18:04:40 2010 @@ -2029,7 +2029,7 @@ static PyObject * posix_fsync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fsync); + return posix_fildes(fdobj, fsync); } #endif /* HAVE_FSYNC */ @@ -2047,7 +2047,7 @@ static PyObject * posix_fdatasync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fdatasync); + return posix_fildes(fdobj, fdatasync); } #endif /* HAVE_FDATASYNC */ @@ -3000,7 +3000,7 @@ !SystemTimeToFileTime(&now, &atime)) { win32_error("utime", NULL); goto done; - } + } } else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) { PyErr_SetString(PyExc_TypeError, @@ -4053,9 +4053,9 @@ for (i = 0; i < n; ++i) { PyObject *o = PyLong_FromLong((long)alt_grouplist[i]); if (o == NULL) { - Py_DECREF(result); - result = NULL; - break; + Py_DECREF(result); + result = NULL; + break; } PyList_SET_ITEM(result, i, o); } @@ -5847,38 +5847,38 @@ size_t tablesize) { if (PyLong_Check(arg)) { - *valuep = PyLong_AS_LONG(arg); - return 1; + *valuep = PyLong_AS_LONG(arg); + return 1; } else { - /* look up the value in the table using a binary search */ - size_t lo = 0; - size_t mid; - size_t hi = tablesize; - int cmp; - const char *confname; - if (!PyUnicode_Check(arg)) { - PyErr_SetString(PyExc_TypeError, - "configuration names must be strings or integers"); - return 0; - } - confname = _PyUnicode_AsString(arg); - if (confname == NULL) - return 0; - while (lo < hi) { - mid = (lo + hi) / 2; - cmp = strcmp(confname, table[mid].name); - if (cmp < 0) - hi = mid; - else if (cmp > 0) - lo = mid + 1; - else { - *valuep = table[mid].value; - return 1; + /* look up the value in the table using a binary search */ + size_t lo = 0; + size_t mid; + size_t hi = tablesize; + int cmp; + const char *confname; + if (!PyUnicode_Check(arg)) { + PyErr_SetString(PyExc_TypeError, + "configuration names must be strings or integers"); + return 0; } - } - PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); - return 0; + confname = _PyUnicode_AsString(arg); + if (confname == NULL) + return 0; + while (lo < hi) { + mid = (lo + hi) / 2; + cmp = strcmp(confname, table[mid].name); + if (cmp < 0) + hi = mid; + else if (cmp > 0) + lo = mid + 1; + else { + *valuep = table[mid].value; + return 1; + } + } + PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); + return 0; } } @@ -5961,14 +5961,14 @@ if (PyArg_ParseTuple(args, "iO&:fpathconf", &fd, conv_path_confname, &name)) { - long limit; + long limit; - errno = 0; - limit = fpathconf(fd, name); - if (limit == -1 && errno != 0) - posix_error(); - else - result = PyLong_FromLong(limit); + errno = 0; + limit = fpathconf(fd, name); + if (limit == -1 && errno != 0) + posix_error(); + else + result = PyLong_FromLong(limit); } return result; } @@ -6793,21 +6793,21 @@ sizeof(posix_constants_pathconf) / sizeof(struct constdef), "pathconf_names", module)) - return -1; + return -1; #endif #ifdef HAVE_CONFSTR if (setup_confname_table(posix_constants_confstr, sizeof(posix_constants_confstr) / sizeof(struct constdef), "confstr_names", module)) - return -1; + return -1; #endif #ifdef HAVE_SYSCONF if (setup_confname_table(posix_constants_sysconf, sizeof(posix_constants_sysconf) / sizeof(struct constdef), "sysconf_names", module)) - return -1; + return -1; #endif return 0; } @@ -6923,10 +6923,10 @@ { double loadavg[3]; if (getloadavg(loadavg, 3)!=3) { - PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); - return NULL; + PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); + return NULL; } else - return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); + return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); } #endif

1 0

r86809 - python/branches/py3k-stat-on-windows/Lib/test/test_os.py
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 17:36:48 2010 New Revision: 86809 Log: On windows: when symlink has executable extension and target does not, os.stat(symlink) should not set S_IEXEC. (Only test now) Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py ============================================================================== --- python/branches/py3k-stat-on-windows/Lib/test/test_os.py (original) +++ python/branches/py3k-stat-on-windows/Lib/test/test_os.py Fri Nov 26 17:36:48 2010 @@ -15,6 +15,7 @@ import contextlib import mmap import uuid +import stat # Detect whether we're on a Linux system that uses the (now outdated # and unmaintained) linuxthreads threading library. There's an issue @@ -1124,7 +1125,7 @@ @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests") @support.skip_unless_symlink class Win32SymlinkTests(unittest.TestCase): - filelink = 'filelinktest' + filelink = 'filelinktest.bat' filelink_target = os.path.abspath(__file__) dirlink = 'dirlinktest' dirlink_target = os.path.dirname(filelink_target) @@ -1158,6 +1159,7 @@ self.assertTrue(os.path.isfile(self.filelink)) self.assertTrue(os.path.islink(self.filelink)) self.check_stat(self.filelink, self.filelink_target) + self.assertFalse(os.stat(self.filelink).st_mode & stat.S_IEXEC) def _create_missing_dir_link(self): 'Create a "directory" link to a non-existent target' @@ -1192,7 +1194,6 @@ self.assertEqual(os.stat(link), os.stat(target)) self.assertNotEqual(os.lstat(link), os.stat(link)) - class FSEncodingTests(unittest.TestCase): def test_nop(self): self.assertEqual(os.fsencode(b'abc\xff'), b'abc\xff')

1 0

r86808 - python/branches/py3k/Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 17:16:47 2010 New Revision: 86808 Log: Further indentation cleanup. Modified: python/branches/py3k/Modules/posixmodule.c Modified: python/branches/py3k/Modules/posixmodule.c ============================================================================== --- python/branches/py3k/Modules/posixmodule.c (original) +++ python/branches/py3k/Modules/posixmodule.c Fri Nov 26 17:16:47 2010 @@ -2050,7 +2050,7 @@ static PyObject * posix_fsync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fsync); + return posix_fildes(fdobj, fsync); } #endif /* HAVE_FSYNC */ @@ -2068,7 +2068,7 @@ static PyObject * posix_fdatasync(PyObject *self, PyObject *fdobj) { - return posix_fildes(fdobj, fdatasync); + return posix_fildes(fdobj, fdatasync); } #endif /* HAVE_FDATASYNC */ @@ -2549,7 +2549,7 @@ if (!PyArg_ParseTuple(args, "|O&:listdir", PyUnicode_FSConverter, &oname)) return NULL; if (oname == NULL) { /* Default arg: "." */ - oname = PyBytes_FromString("."); + oname = PyBytes_FromString("."); } name = PyBytes_AsString(oname); Py_BEGIN_ALLOW_THREADS @@ -3188,7 +3188,7 @@ !SystemTimeToFileTime(&now, &atime)) { win32_error("utime", NULL); goto done; - } + } } else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) { PyErr_SetString(PyExc_TypeError, @@ -4256,9 +4256,9 @@ for (i = 0; i < n; ++i) { PyObject *o = PyLong_FromLong((long)alt_grouplist[i]); if (o == NULL) { - Py_DECREF(result); - result = NULL; - break; + Py_DECREF(result); + result = NULL; + break; } PyList_SET_ITEM(result, i, o); } @@ -6362,38 +6362,38 @@ size_t tablesize) { if (PyLong_Check(arg)) { - *valuep = PyLong_AS_LONG(arg); - return 1; + *valuep = PyLong_AS_LONG(arg); + return 1; } else { - /* look up the value in the table using a binary search */ - size_t lo = 0; - size_t mid; - size_t hi = tablesize; - int cmp; - const char *confname; - if (!PyUnicode_Check(arg)) { - PyErr_SetString(PyExc_TypeError, - "configuration names must be strings or integers"); - return 0; - } - confname = _PyUnicode_AsString(arg); - if (confname == NULL) - return 0; - while (lo < hi) { - mid = (lo + hi) / 2; - cmp = strcmp(confname, table[mid].name); - if (cmp < 0) - hi = mid; - else if (cmp > 0) - lo = mid + 1; - else { - *valuep = table[mid].value; - return 1; + /* look up the value in the table using a binary search */ + size_t lo = 0; + size_t mid; + size_t hi = tablesize; + int cmp; + const char *confname; + if (!PyUnicode_Check(arg)) { + PyErr_SetString(PyExc_TypeError, + "configuration names must be strings or integers"); + return 0; } - } - PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); - return 0; + confname = _PyUnicode_AsString(arg); + if (confname == NULL) + return 0; + while (lo < hi) { + mid = (lo + hi) / 2; + cmp = strcmp(confname, table[mid].name); + if (cmp < 0) + hi = mid; + else if (cmp > 0) + lo = mid + 1; + else { + *valuep = table[mid].value; + return 1; + } + } + PyErr_SetString(PyExc_ValueError, "unrecognized configuration name"); + return 0; } } @@ -6509,14 +6509,14 @@ if (PyArg_ParseTuple(args, "iO&:fpathconf", &fd, conv_path_confname, &name)) { - long limit; + long limit; - errno = 0; - limit = fpathconf(fd, name); - if (limit == -1 && errno != 0) - posix_error(); - else - result = PyLong_FromLong(limit); + errno = 0; + limit = fpathconf(fd, name); + if (limit == -1 && errno != 0) + posix_error(); + else + result = PyLong_FromLong(limit); } return result; } @@ -7343,21 +7343,21 @@ sizeof(posix_constants_pathconf) / sizeof(struct constdef), "pathconf_names", module)) - return -1; + return -1; #endif #ifdef HAVE_CONFSTR if (setup_confname_table(posix_constants_confstr, sizeof(posix_constants_confstr) / sizeof(struct constdef), "confstr_names", module)) - return -1; + return -1; #endif #ifdef HAVE_SYSCONF if (setup_confname_table(posix_constants_sysconf, sizeof(posix_constants_sysconf) / sizeof(struct constdef), "sysconf_names", module)) - return -1; + return -1; #endif return 0; } @@ -7470,10 +7470,10 @@ { double loadavg[3]; if (getloadavg(loadavg, 3)!=3) { - PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); - return NULL; + PyErr_SetString(PyExc_OSError, "Load averages are unobtainable"); + return NULL; } else - return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); + return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]); } #endif

1 0

r86807 - in python/branches/release31-maint: Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 16:08:59 2010 New Revision: 86807 Log: Merged revisions 86804 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86804 | stefan.krah | 2010-11-26 13:58:05 +0100 (Fri, 26 Nov 2010) | 1 line Issue #10383: Fix two leaks. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Modules/posixmodule.c Modified: python/branches/release31-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release31-maint/Modules/posixmodule.c (original) +++ python/branches/release31-maint/Modules/posixmodule.c Fri Nov 26 16:08:59 2010 @@ -5138,8 +5138,10 @@ buffer = PyBytes_FromStringAndSize((char *)NULL, size); if (buffer == NULL) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + Py_DECREF(buffer); return posix_error(); + } Py_BEGIN_ALLOW_THREADS n = read(fd, PyBytes_AS_STRING(buffer), size); Py_END_ALLOW_THREADS @@ -5166,12 +5168,14 @@ if (!PyArg_ParseTuple(args, "iy*:write", &fd, &pbuf)) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + PyBuffer_Release(&pbuf); return posix_error(); + } Py_BEGIN_ALLOW_THREADS size = write(fd, pbuf.buf, (size_t)pbuf.len); Py_END_ALLOW_THREADS - PyBuffer_Release(&pbuf); + PyBuffer_Release(&pbuf); if (size < 0) return posix_error(); return PyLong_FromSsize_t(size); @@ -5992,10 +5996,10 @@ limit = pathconf(path, name); if (limit == -1 && errno != 0) { if (errno == EINVAL) - /* could be a path or name problem */ - posix_error(); + /* could be a path or name problem */ + posix_error(); else - posix_error_with_filename(path); + posix_error_with_filename(path); } else result = PyLong_FromLong(limit); @@ -6178,7 +6182,7 @@ char buffer[256]; if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) { - int len; + int len; errno = 0; len = confstr(name, buffer, sizeof(buffer));

1 0

r86806 - in python/branches/release27-maint: Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 16:06:27 2010 New Revision: 86806 Log: Merged revisions 86804 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86804 | stefan.krah | 2010-11-26 13:58:05 +0100 (Fri, 26 Nov 2010) | 1 line Issue #10383: Fix two leaks. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Modules/posixmodule.c Modified: python/branches/release27-maint/Modules/posixmodule.c ============================================================================== --- python/branches/release27-maint/Modules/posixmodule.c (original) +++ python/branches/release27-maint/Modules/posixmodule.c Fri Nov 26 16:06:27 2010 @@ -6572,8 +6572,10 @@ buffer = PyString_FromStringAndSize((char *)NULL, size); if (buffer == NULL) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + Py_DECREF(buffer); return posix_error(); + } Py_BEGIN_ALLOW_THREADS n = read(fd, PyString_AsString(buffer), size); Py_END_ALLOW_THREADS @@ -6600,12 +6602,14 @@ if (!PyArg_ParseTuple(args, "is*:write", &fd, &pbuf)) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + PyBuffer_Release(&pbuf); return posix_error(); + } Py_BEGIN_ALLOW_THREADS size = write(fd, pbuf.buf, (size_t)pbuf.len); Py_END_ALLOW_THREADS - PyBuffer_Release(&pbuf); + PyBuffer_Release(&pbuf); if (size < 0) return posix_error(); return PyInt_FromSsize_t(size); @@ -7525,10 +7529,10 @@ limit = pathconf(path, name); if (limit == -1 && errno != 0) { if (errno == EINVAL) - /* could be a path or name problem */ - posix_error(); + /* could be a path or name problem */ + posix_error(); else - posix_error_with_filename(path); + posix_error_with_filename(path); } else result = PyInt_FromLong(limit);

1 0

r86805 - python/branches/py3k-stat-on-windows/Modules/posixmodule.c
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 15:15:45 2010 New Revision: 86805 Log: Typo fix: should use ULONG not BOOL. Modified: python/branches/py3k-stat-on-windows/Modules/posixmodule.c Modified: python/branches/py3k-stat-on-windows/Modules/posixmodule.c ============================================================================== --- python/branches/py3k-stat-on-windows/Modules/posixmodule.c (original) +++ python/branches/py3k-stat-on-windows/Modules/posixmodule.c Fri Nov 26 15:15:45 2010 @@ -1213,7 +1213,7 @@ win32_xstat_for_handle(HANDLE hFile, struct win32_stat *result, BOOL traverse, int depth) { int code; - BOOL reparse_tag; + ULONG reparse_tag; wchar_t *target_path; BY_HANDLE_FILE_INFORMATION info;

1 0

r86804 - python/branches/py3k/Modules/posixmodule.c
by stefan.krah Nov. 26, 2010

Nov. 26, 2010

Author: stefan.krah Date: Fri Nov 26 13:58:05 2010 New Revision: 86804 Log: Issue #10383: Fix two leaks. Modified: python/branches/py3k/Modules/posixmodule.c Modified: python/branches/py3k/Modules/posixmodule.c ============================================================================== --- python/branches/py3k/Modules/posixmodule.c (original) +++ python/branches/py3k/Modules/posixmodule.c Fri Nov 26 13:58:05 2010 @@ -5620,8 +5620,10 @@ buffer = PyBytes_FromStringAndSize((char *)NULL, size); if (buffer == NULL) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + Py_DECREF(buffer); return posix_error(); + } Py_BEGIN_ALLOW_THREADS n = read(fd, PyBytes_AS_STRING(buffer), size); Py_END_ALLOW_THREADS @@ -5648,12 +5650,14 @@ if (!PyArg_ParseTuple(args, "iy*:write", &fd, &pbuf)) return NULL; - if (!_PyVerify_fd(fd)) + if (!_PyVerify_fd(fd)) { + PyBuffer_Release(&pbuf); return posix_error(); + } Py_BEGIN_ALLOW_THREADS size = write(fd, pbuf.buf, (size_t)pbuf.len); Py_END_ALLOW_THREADS - PyBuffer_Release(&pbuf); + PyBuffer_Release(&pbuf); if (size < 0) return posix_error(); return PyLong_FromSsize_t(size); @@ -6540,10 +6544,10 @@ limit = pathconf(path, name); if (limit == -1 && errno != 0) { if (errno == EINVAL) - /* could be a path or name problem */ - posix_error(); + /* could be a path or name problem */ + posix_error(); else - posix_error_with_filename(path); + posix_error_with_filename(path); } else result = PyLong_FromLong(limit); @@ -6724,7 +6728,7 @@ PyObject *result = NULL; int name; char buffer[255]; - int len; + int len; if (!PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) return NULL;

1 0