Mailman 3 November 2014 - Python-checkins

cpython (merge 3.4 -> default): merge 3.4 (#22954)
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/d502b5d60e00 changeset: 93612:d502b5d60e00 parent: 93610:7fe7ef360941 parent: 93611:a498e599ce6a user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 23:03:34 2014 -0600 summary: merge 3.4 (#22954) files: Objects/typeobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5381,7 +5381,7 @@ "%s.__new__(%s) is not safe, use %s.__new__()", type->tp_name, subtype->tp_name, - staticbase == NULL ? "?" : staticbase->tp_name); + staticbase->tp_name); return NULL; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): remove tautological condition (closes #22954)
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/ec21b41e588b changeset: 93613:ec21b41e588b branch: 2.7 parent: 93606:3f5ac9f43027 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 23:03:11 2014 -0600 summary: remove tautological condition (closes #22954) files: Objects/typeobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4798,7 +4798,7 @@ "%s.__new__(%s) is not safe, use %s.__new__()", type->tp_name, subtype->tp_name, - staticbase == NULL ? "?" : staticbase->tp_name); + staticbase->tp_name); return NULL; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): remove tautological condition (closes #22954)
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/a498e599ce6a changeset: 93611:a498e599ce6a branch: 3.4 parent: 93609:6fce36de7916 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 23:03:11 2014 -0600 summary: remove tautological condition (closes #22954) files: Objects/typeobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5342,7 +5342,7 @@ "%s.__new__(%s) is not safe, use %s.__new__()", type->tp_name, subtype->tp_name, - staticbase == NULL ? "?" : staticbase->tp_name); + staticbase->tp_name); return NULL; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge with 3.4
by zach.ware 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/7fe7ef360941 changeset: 93610:7fe7ef360941 parent: 93608:c8bcede1b37a parent: 93609:6fce36de7916 user: Zachary Ware <zachary.ware(a)gmail.com> date: Wed Nov 26 22:58:25 2014 -0600 summary: Merge with 3.4 files: Doc/library/pydoc.rst | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst --- a/Doc/library/pydoc.rst +++ b/Doc/library/pydoc.rst @@ -66,11 +66,6 @@ documentation at ``http://localhost:1234/`` in your preferred Web browser. Specifying ``0`` as the port number will select an arbitrary unused port. -:program:`pydoc -g` will start the server and additionally bring up a -small :mod:`tkinter`\ -based graphical interface to help you search for -documentation pages. The ``-g`` option is deprecated, since the server can -now be controlled directly from HTTP clients. - :program:`pydoc -b` will start the server and additionally open a web browser to a module index page. Each served page has a navigation bar at the top where you can *Get* help on an individual item, *Search* all modules with a @@ -90,7 +85,10 @@ Reference Manual pages. .. versionchanged:: 3.2 - Added the ``-b`` option, deprecated the ``-g`` option. + Added the ``-b`` option. + +.. versionchanged:: 3.3 + The ``-g`` command line option was removed. .. versionchanged:: 3.4 :mod:`pydoc` now uses :func:`inspect.signature` rather than -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): pydoc: Remove mention of '-g' command line option, document its removal.
by zach.ware 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/6fce36de7916 changeset: 93609:6fce36de7916 branch: 3.4 parent: 93604:812f31cbe6be user: Zachary Ware <zachary.ware(a)gmail.com> date: Wed Nov 26 22:57:35 2014 -0600 summary: pydoc: Remove mention of '-g' command line option, document its removal. files: Doc/library/pydoc.rst | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst --- a/Doc/library/pydoc.rst +++ b/Doc/library/pydoc.rst @@ -66,11 +66,6 @@ documentation at ``http://localhost:1234/`` in your preferred Web browser. Specifying ``0`` as the port number will select an arbitrary unused port. -:program:`pydoc -g` will start the server and additionally bring up a -small :mod:`tkinter`\ -based graphical interface to help you search for -documentation pages. The ``-g`` option is deprecated, since the server can -now be controlled directly from HTTP clients. - :program:`pydoc -b` will start the server and additionally open a web browser to a module index page. Each served page has a navigation bar at the top where you can *Get* help on an individual item, *Search* all modules with a @@ -90,7 +85,10 @@ Reference Manual pages. .. versionchanged:: 3.2 - Added the ``-b`` option, deprecated the ``-g`` option. + Added the ``-b`` option. + +.. versionchanged:: 3.3 + The ``-g`` command line option was removed. .. versionchanged:: 3.4 :mod:`pydoc` now uses :func:`inspect.signature` rather than -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue 22940: fixes to editline support
by ned.deily 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/c8bcede1b37a changeset: 93608:c8bcede1b37a user: Ned Deily <nad(a)acm.org> date: Wed Nov 26 13:02:33 2014 -0800 summary: Issue 22940: fixes to editline support files: Lib/test/test_readline.py | 2 +- Modules/readline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -43,7 +43,7 @@ self.assertEqual(readline.get_current_history_length(), 1) - @unittest.skipUnless(hasattr(readline, "append_history"), + @unittest.skipUnless(hasattr(readline, "append_history_file"), "append_history not available") def test_write_read_append(self): hfile = tempfile.NamedTemporaryFile(delete=False) diff --git a/Modules/readline.c b/Modules/readline.c --- a/Modules/readline.c +++ b/Modules/readline.c @@ -786,8 +786,8 @@ METH_VARARGS, doc_write_history_file}, #ifdef HAVE_RL_APPEND_HISTORY {"append_history_file", append_history_file, + METH_VARARGS, doc_append_history_file}, #endif - METH_VARARGS, doc_append_history_file}, {"get_history_item", get_history_item, METH_VARARGS, doc_get_history_item}, {"get_current_history_length", (PyCFunction)get_current_history_length, -- Repository URL: https://hg.python.org/cpython

1 0

cpython: correct assertion
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/edc8a0bb95aa changeset: 93607:edc8a0bb95aa parent: 93605:6528f943c1bd user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 14:39:54 2014 -0600 summary: correct assertion files: Python/codecs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -1019,7 +1019,7 @@ *outp++ = Py_hexdigits[c&0xf]; } - assert(outp == start + ressize); + assert(outp == PyUnicode_1BYTE_DATA(res) + ressize); assert(_PyUnicode_CheckConsistency(res, 1)); restuple = Py_BuildValue("(Nn)", res, end); Py_DECREF(object); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): use skipUnless
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/3f5ac9f43027 changeset: 93606:3f5ac9f43027 branch: 2.7 parent: 93600:ac2175c5b743 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 14:35:56 2014 -0600 summary: use skipUnless files: Lib/test/test_readline.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -15,9 +15,9 @@ That's why the tests cover only a small subset of the interface. """ - @unittest.skipIf(not hasattr(readline, 'clear_history'), - "The history update test cannot be run because the " - "clear_history method is not available.") + @unittest.skipUnless(hasattr(readline, "clear_history"), + "The history update test cannot be run because the " + "clear_history method is not available.") def testHistoryUpdates(self): readline.clear_history() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): use skipUnless
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/812f31cbe6be changeset: 93604:812f31cbe6be branch: 3.4 parent: 93591:e635c3ba75c8 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 14:35:56 2014 -0600 summary: use skipUnless files: Lib/test/test_readline.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -16,9 +16,9 @@ why the tests cover only a small subset of the interface. """ - @unittest.skipIf(not hasattr(readline, 'clear_history'), - "The history update test cannot be run because the " - "clear_history method is not available.") + @unittest.skipUnless(hasattr(readline, "clear_history"), + "The history update test cannot be run because the " + "clear_history method is not available.") def testHistoryUpdates(self): readline.clear_history() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson 26 Nov '14

26 Nov '14

https://hg.python.org/cpython/rev/6528f943c1bd changeset: 93605:6528f943c1bd parent: 93603:031ab6d4a0f3 parent: 93604:812f31cbe6be user: Benjamin Peterson <benjamin(a)python.org> date: Wed Nov 26 14:36:08 2014 -0600 summary: merge 3.4 files: Lib/test/test_readline.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -17,9 +17,9 @@ why the tests cover only a small subset of the interface. """ - @unittest.skipIf(not hasattr(readline, 'clear_history'), - "The history update test cannot be run because the " - "clear_history method is not available.") + @unittest.skipUnless(hasattr(readline, "clear_history"), + "The history update test cannot be run because the " + "clear_history method is not available.") def testHistoryUpdates(self): readline.clear_history() -- Repository URL: https://hg.python.org/cpython

1 0