Mailman 3 August 2012 - Python-checkins

cpython (2.7): Closes #15807: Removed incorrect directive from help.
by vinay.sajip Aug. 29, 2012

Aug. 29, 2012

http://hg.python.org/cpython/rev/48f54b6bf0ef changeset: 78799:48f54b6bf0ef branch: 2.7 parent: 78792:2801bf875a24 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Wed Aug 29 14:25:42 2012 +0100 summary: Closes #15807: Removed incorrect directive from help. files: Doc/library/logging.handlers.rst | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst --- a/Doc/library/logging.handlers.rst +++ b/Doc/library/logging.handlers.rst @@ -698,9 +698,6 @@ .. method:: setTarget(target) - .. versionchanged:: 2.6 - *credentials* was added. - Sets the target handler for this handler. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #15765: Fix quirky NetBSD getcwd() behaviour.
by trent.nelson Aug. 29, 2012

Aug. 29, 2012

http://hg.python.org/cpython/rev/bfa5d0ddfbeb changeset: 78798:bfa5d0ddfbeb branch: 2.7 parent: 78792:2801bf875a24 user: Trent Nelson <trent(a)trent.me> date: Wed Aug 29 09:20:41 2012 -0400 summary: Issue #15765: Fix quirky NetBSD getcwd() behaviour. This is done by extending a previous fix for issue #9185 that was made for Solaris and OpenBSD to NetBSD as well. files: Lib/test/test_posix.py | 12 ++++++++++-- Misc/NEWS | 3 +++ Modules/posixmodule.c | 4 +++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -405,8 +405,16 @@ _create_and_do_getcwd(dirname, current_path_length + len(dirname) + 1) except OSError as e: expected_errno = errno.ENAMETOOLONG - if 'sunos' in sys.platform or 'openbsd' in sys.platform: - expected_errno = errno.ERANGE # Issue 9185 + # The following platforms have quirky getcwd() + # behaviour -- see issue 9185 and 15765 for + # more information. + quirky_platform = ( + 'sunos' in sys.platform or + 'netbsd' in sys.platform or + 'openbsd' in sys.platform + ) + if quirky_platform: + expected_errno = errno.ERANGE self.assertEqual(e.errno, expected_errno) finally: os.chdir('..') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -346,6 +346,9 @@ Tests ----- +- Issue #15765: Extend a previous fix to Solaris and OpenBSD for quirky + getcwd() behaviour (issue #9185) to NetBSD as well. + - Issue #15615: Add some tests for the json module's handling of invalid input data. Patch by Kushal Das. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1956,7 +1956,9 @@ "getcwd() -> path\n\n\ Return a string representing the current working directory."); -#if (defined(__sun) && defined(__SVR4)) || defined(__OpenBSD__) +#if (defined(__sun) && defined(__SVR4)) || \ + defined(__OpenBSD__) || \ + defined(__NetBSD__) /* Issue 9185: getcwd() returns NULL/ERANGE indefinitely. */ static PyObject * posix_getcwd(PyObject *self, PyObject *noargs) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: move entry to the correct version
by benjamin.peterson Aug. 29, 2012

Aug. 29, 2012

http://hg.python.org/cpython/rev/124fb2b39ed9 changeset: 78797:124fb2b39ed9 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Aug 29 08:04:11 2012 -0400 summary: move entry to the correct version files: Misc/NEWS | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + Library ------- @@ -79,9 +82,6 @@ - Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. -- Issue #15801: Make sure mappings passed to '%' formatting are actually - subscriptable. - - Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by Robin Schreiber. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (c58789634d22): sum=0
by solipsis＠pitrou.net Aug. 29, 2012

Aug. 29, 2012

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

1 0

cpython: Issue #15785: Modify window.get_wch() API of the curses module: return a
by victor.stinner Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/c58789634d22 changeset: 78796:c58789634d22 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Aug 29 01:40:57 2012 +0200 summary: Issue #15785: Modify window.get_wch() API of the curses module: return a character for most keys, and an integer for special keys, instead of always returning an integer. So it is now possible to distinguish special keys like keypad keys. files: Doc/library/curses.rst | 9 +++++---- Lib/test/test_curses.py | 12 +++++------- Misc/NEWS | 7 ++++++- Modules/_cursesmodule.c | 5 ++++- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst --- a/Doc/library/curses.rst +++ b/Doc/library/curses.rst @@ -869,8 +869,8 @@ .. method:: window.get_wch([y, x]) - Get a wide character. Like :meth:`getch`, but the integer returned is the - Unicode code point for the key pressed, so it can be passed to :func:`chr`. + Get a wide character. Return a character for most keys, or an integer for + function keys, keypad keys, and other special keys. .. versionadded:: 3.3 @@ -878,8 +878,9 @@ .. method:: window.getkey([y, x]) Get a character, returning a string instead of an integer, as :meth:`getch` - does. Function keys, keypad keys and so on return a multibyte string containing - the key name. In no-delay mode, an exception is raised if there is no input. + does. Function keys, keypad keys and other special keys return a multibyte + string containing the key name. In no-delay mode, an exception is raised if + there is no input. .. method:: window.getmaxyx() diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -267,8 +267,7 @@ def test_unget_wch(stdscr): if not hasattr(curses, 'unget_wch'): return - import locale - encoding = locale.getpreferredencoding() + encoding = stdscr.encoding for ch in ('a', '\xe9', '\u20ac', '\U0010FFFF'): try: ch.encode(encoding) @@ -277,18 +276,17 @@ try: curses.unget_wch(ch) except Exception as err: - raise Exception("unget_wch(%a) failed with locale encoding %s: %s" - % (ch, encoding, err)) + raise Exception("unget_wch(%a) failed with encoding %s: %s" + % (ch, stdscr.encoding, err)) read = stdscr.get_wch() - read = chr(read) if read != ch: raise AssertionError("%r != %r" % (read, ch)) code = ord(ch) curses.unget_wch(code) read = stdscr.get_wch() - if read != code: - raise AssertionError("%r != %r" % (read, code)) + if read != ch: + raise AssertionError("%r != %r" % (read, ch)) def test_issue10570(): b = curses.tparm(curses.tigetstr("cup"), 5, 3) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -48,6 +48,11 @@ Library ------- +- Issue #15785: Modify window.get_wch() API of the curses module: return + a character for most keys, and an integer for special keys, instead of + always returning an integer. So it is now possible to distinguish special + keys like keypad keys. + What's New in Python 3.3.0 Release Candidate 1? =============================================== @@ -58,7 +63,7 @@ ----------------- - Issue #15573: memoryview comparisons are now performed by value with full - support for any valid struct module format definition. + support for any valid struct module format definition. - Issue #15316: When an item in the fromlist for __import__ doesn't exist, don't raise an error, but if an exception is raised as part of an import do diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -1203,7 +1203,10 @@ PyErr_SetString(PyCursesError, "no input"); return NULL; } - return PyLong_FromLong(rtn); + if (ct == KEY_CODE_YES) + return PyLong_FromLong(rtn); + else + return PyUnicode_FromOrdinal(rtn); } #endif -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge heads
by benjamin.peterson Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/786d9516663e changeset: 78795:786d9516663e parent: 78794:263d09ce3e9e parent: 78791:2e587b9bae35 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Aug 28 18:02:18 2012 -0400 summary: merge heads files: Lib/test/test_exceptions.py | 4 ++-- Misc/NEWS | 3 +++ Objects/exceptions.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -216,14 +216,14 @@ self.assertEqual(w.winerror, 3) self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, 'bar') - self.assertEqual(str(w), "[Error 3] foo: 'bar'") + self.assertEqual(str(w), "[WinError 3] foo: 'bar'") # Unknown win error becomes EINVAL (22) w = OSError(0, 'foo', None, 1001) self.assertEqual(w.errno, 22) self.assertEqual(w.winerror, 1001) self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, None) - self.assertEqual(str(w), "[Error 1001] foo") + self.assertEqual(str(w), "[WinError 1001] foo") # Non-numeric "errno" w = OSError('bar', 'foo') self.assertEqual(w.errno, 'bar') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins ----------------- +- Issue #15784: Modify OSError.__str__() to better distinguish between + errno error numbers and Windows error numbers. + - Issue #15781: Fix two small race conditions in import's module locking. Library diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1016,12 +1016,12 @@ #ifdef MS_WINDOWS /* If available, winerror has the priority over myerrno */ if (self->winerror && self->filename) - return PyUnicode_FromFormat("[Error %S] %S: %R", + return PyUnicode_FromFormat("[WinError %S] %S: %R", self->winerror ? self->winerror: Py_None, self->strerror ? self->strerror: Py_None, self->filename); if (self->winerror && self->strerror) - return PyUnicode_FromFormat("[Error %S] %S", + return PyUnicode_FromFormat("[WinError %S] %S", self->winerror ? self->winerror: Py_None, self->strerror ? self->strerror: Py_None); #endif -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2 (#15801)
by benjamin.peterson Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/263d09ce3e9e changeset: 78794:263d09ce3e9e parent: 78790:454dceb5fd56 parent: 78793:4d431e719646 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Aug 28 18:01:45 2012 -0400 summary: merge 3.2 (#15801) files: Lib/test/string_tests.py | 3 +++ Misc/NEWS | 3 +++ Objects/unicodeobject.c | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -1206,6 +1206,9 @@ self.checkraises(ValueError, '%%%df' % (2**64), '__mod__', (3.2)) self.checkraises(ValueError, '%%.%df' % (2**64), '__mod__', (3.2)) + class X(object): pass + self.checkraises(TypeError, 'abc', '__mod__', X()) + def test_floatformatting(self): # float formatting for prec in range(100): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -71,6 +71,9 @@ - Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + - Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by Robin Schreiber. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13461,8 +13461,7 @@ arglen = -1; argidx = -2; } - if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && - !PyUnicode_Check(args)) + if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args)) dict = args; while (--fmtcnt >= 0) { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): use the stricter PyMapping_Check (closes #15801)
by benjamin.peterson Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/4d431e719646 changeset: 78793:4d431e719646 branch: 3.2 parent: 78787:5c13bd7f6256 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Aug 28 17:55:35 2012 -0400 summary: use the stricter PyMapping_Check (closes #15801) files: Lib/test/string_tests.py | 3 +++ Misc/NEWS | 3 +++ Objects/unicodeobject.c | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -1142,6 +1142,9 @@ self.checkraises(TypeError, '%10.*f', '__mod__', ('foo', 42.)) self.checkraises(ValueError, '%10', '__mod__', (42,)) + class X(object): pass + self.checkraises(TypeError, 'abc', '__mod__', X()) + def test_floatformatting(self): # float formatting for prec in range(100): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ - Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X. +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + - Issue #15726: Fix incorrect bounds checking in PyState_FindModule. Patch by Robin Schreiber. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9504,8 +9504,7 @@ arglen = -1; argidx = -2; } - if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && - !PyUnicode_Check(args)) + if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args)) dict = args; while (--fmtcnt >= 0) { -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): use the stricter PyMapping_Check (closes #15801)
by benjamin.peterson Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/2801bf875a24 changeset: 78792:2801bf875a24 branch: 2.7 parent: 78789:ec4ea40be2f6 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Aug 28 17:55:35 2012 -0400 summary: use the stricter PyMapping_Check (closes #15801) files: Lib/test/string_tests.py | 3 +++ Misc/NEWS | 3 +++ Objects/stringobject.c | 2 +- Objects/unicodeobject.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -1113,6 +1113,9 @@ self.checkraises(TypeError, '%10.*f', '__mod__', ('foo', 42.)) self.checkraises(ValueError, '%10', '__mod__', (42,)) + class X(object): pass + self.checkraises(TypeError, 'abc', '__mod__', X()) + def test_floatformatting(self): # float formatting for prec in xrange(100): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + - Issue #15604: Update uses of PyObject_IsTrue() to check for and handle errors correctly. Patch by Serhiy Storchaka. diff --git a/Objects/stringobject.c b/Objects/stringobject.c --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4254,7 +4254,7 @@ arglen = -1; argidx = -2; } - if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && + if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyObject_TypeCheck(args, &PyBaseString_Type)) dict = args; while (--fmtcnt >= 0) { diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8275,7 +8275,7 @@ arglen = -1; argidx = -2; } - if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) && + if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyObject_TypeCheck(args, &PyBaseString_Type)) dict = args; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #15784: Modify OSError.__str__() to better distinguish between
by richard.oudkerk Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/2e587b9bae35 changeset: 78791:2e587b9bae35 user: Richard Oudkerk <shibturn(a)gmail.com> date: Tue Aug 28 19:33:26 2012 +0100 summary: Issue #15784: Modify OSError.__str__() to better distinguish between errno error numbers and Windows error numbers. files: Lib/test/test_exceptions.py | 4 ++-- Misc/NEWS | 3 +++ Objects/exceptions.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -216,14 +216,14 @@ self.assertEqual(w.winerror, 3) self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, 'bar') - self.assertEqual(str(w), "[Error 3] foo: 'bar'") + self.assertEqual(str(w), "[WinError 3] foo: 'bar'") # Unknown win error becomes EINVAL (22) w = OSError(0, 'foo', None, 1001) self.assertEqual(w.errno, 22) self.assertEqual(w.winerror, 1001) self.assertEqual(w.strerror, 'foo') self.assertEqual(w.filename, None) - self.assertEqual(str(w), "[Error 1001] foo") + self.assertEqual(str(w), "[WinError 1001] foo") # Non-numeric "errno" w = OSError('bar', 'foo') self.assertEqual(w.errno, 'bar') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins ----------------- +- Issue #15784: Modify OSError.__str__() to better distinguish between + errno error numbers and Windows error numbers. + - Issue #15781: Fix two small race conditions in import's module locking. Library diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1016,12 +1016,12 @@ #ifdef MS_WINDOWS /* If available, winerror has the priority over myerrno */ if (self->winerror && self->filename) - return PyUnicode_FromFormat("[Error %S] %S: %R", + return PyUnicode_FromFormat("[WinError %S] %S: %R", self->winerror ? self->winerror: Py_None, self->strerror ? self->strerror: Py_None, self->filename); if (self->winerror && self->strerror) - return PyUnicode_FromFormat("[Error %S] %S", + return PyUnicode_FromFormat("[WinError %S] %S", self->winerror ? self->winerror: Py_None, self->strerror ? self->strerror: Py_None); #endif -- Repository URL: http://hg.python.org/cpython

1 0