Mailman 3 March 2012 - Python-checkins

cpython (merge 3.2 -> default): merge with 3.2
by sandro.tosi March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/b926a8c386ad changeset: 76022:b926a8c386ad parent: 76016:ee9b6574b497 parent: 76021:6774a2285579 user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Sat Mar 31 18:35:16 2012 +0200 summary: merge with 3.2 files: Doc/library/unittest.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -640,7 +640,7 @@ Classes can be skipped just like methods: :: - @skip("showing class skipping") + @unittest.skip("showing class skipping") class MySkippedTestCase(unittest.TestCase): def test_not_run(self): pass -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): use unittest.skip; thanks to Chang Min Jeon from docs@
by sandro.tosi March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/3ca81a951c31 changeset: 76020:3ca81a951c31 branch: 2.7 parent: 76017:b3a7b27953e0 user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Sat Mar 31 18:34:42 2012 +0200 summary: use unittest.skip; thanks to Chang Min Jeon from docs@ files: Doc/library/unittest.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -616,7 +616,7 @@ Classes can be skipped just like methods: :: - @skip("showing class skipping") + @unittest.skip("showing class skipping") class MySkippedTestCase(unittest.TestCase): def test_not_run(self): pass -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): use unittest.skip; thanks to Chang Min Jeon from docs@
by sandro.tosi March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/6774a2285579 changeset: 76021:6774a2285579 branch: 3.2 parent: 76015:d478c0a68bcb user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Sat Mar 31 18:34:59 2012 +0200 summary: use unittest.skip; thanks to Chang Min Jeon from docs@ files: Doc/library/unittest.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -640,7 +640,7 @@ Classes can be skipped just like methods: :: - @skip("showing class skipping") + @unittest.skip("showing class skipping") class MySkippedTestCase(unittest.TestCase): def test_not_run(self): pass -- Repository URL: http://hg.python.org/cpython

1 0

cpython: fix typo
by andrew.svetlov March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/d2b6d821934a changeset: 76019:d2b6d821934a user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Sat Mar 31 19:44:18 2012 +0300 summary: fix typo files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,7 +37,7 @@ Library ------- -- Issue #5136: deprecated old, unused functions from tkinter. +- Issue #5136: deprecate old, unused functions from tkinter. - Issue #14409: IDLE now properly executes commands in the Shell window when it cannot read the normal config files on startup and -- Repository URL: http://hg.python.org/cpython

1 0

cpython: fix issue #5136: deprecate old unused functions from tkinter.
by andrew.svetlov March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/6023d73c6f87 changeset: 76018:6023d73c6f87 parent: 76016:ee9b6574b497 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Sat Mar 31 19:36:39 2012 +0300 summary: fix issue #5136: deprecate old unused functions from tkinter. These functions are not documnted, so no documentation update. files: Misc/NEWS | 2 ++ Modules/_tkinter.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,8 @@ Library ------- +- Issue #5136: deprecated old, unused functions from tkinter. + - Issue #14409: IDLE now properly executes commands in the Shell window when it cannot read the normal config files on startup and has to use the built-in default key bindings. diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -1343,6 +1343,11 @@ char *cmd; PyObject *res = NULL; + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "globalcall is deprecated and will be removed in 3.4", + 1) < 0) + return 0; + CHECK_TCL_APPARTMENT; cmd = Merge(args); @@ -1392,6 +1397,11 @@ PyObject *res = NULL; int err; + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "globaleval is deprecated and will be removed in 3.4", + 1) < 0) + return 0; + if (!PyArg_ParseTuple(args, "s:globaleval", &script)) return NULL; @@ -1954,9 +1964,16 @@ static PyObject * Tkapp_Merge(PyObject *self, PyObject *args) { - char *s = Merge(args); + char *s; PyObject *res = NULL; + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "merge is deprecated and will be removed in 3.4", + 1) < 0) + return 0; + + s = Merge(args); + if (s) { res = PyUnicode_FromString(s); ckfree(s); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #14409: IDLE doesn't not execute commands from shell with default
by andrew.svetlov March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/26b2407c644e changeset: 75983:26b2407c644e branch: 3.2 parent: 75978:04c19ac9734a user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Thu Mar 29 19:01:28 2012 +0300 summary: Issue #14409: IDLE doesn't not execute commands from shell with default keybinding for <Return>. Patch by Roger Serwy. files: Lib/idlelib/NEWS.txt | 3 +++ Lib/idlelib/configHandler.py | 2 +- Misc/NEWS | 3 +++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,6 +1,9 @@ What's New in IDLE 3.2.3? ========================= +- Issue #14409: IDLE doesn't not execute commands from shell, + error with default keybinding for Return. (Patch by Roger Serwy) + - Issue #3573: IDLE hangs when passing invalid command line args (directory(ies) instead of file(s)). diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py --- a/Lib/idlelib/configHandler.py +++ b/Lib/idlelib/configHandler.py @@ -595,7 +595,7 @@ '<<replace>>': ['<Control-h>'], '<<goto-line>>': ['<Alt-g>'], '<<smart-backspace>>': ['<Key-BackSpace>'], - '<<newline-and-indent>>': ['<Key-Return> <Key-KP_Enter>'], + '<<newline-and-indent>>': ['<Key-Return>', '<Key-KP_Enter>'], '<<smart-indent>>': ['<Key-Tab>'], '<<indent-region>>': ['<Control-Key-bracketright>'], '<<dedent-region>>': ['<Control-Key-bracketleft>'], diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -31,6 +31,9 @@ Library ------- +- Issue #14409: IDLE doesn't not execute commands from shell, + error with default keybinding for Return. (Patch by Roger Serwy) + - Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on OSX; avoid to call handle_connect in case of a disconnected socket which was not meant to connect. -- Repository URL: http://hg.python.org/cpython

5 7

cpython (2.7): #14434: make tutorial link in 'help' banner version-specific
by r.david.murray March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/b3a7b27953e0 changeset: 76017:b3a7b27953e0 branch: 2.7 parent: 76012:9411b7268cf5 user: R David Murray <rdmurray(a)bitdance.com> date: Sat Mar 31 12:10:48 2012 -0400 summary: #14434: make tutorial link in 'help' banner version-specific Without this fix, both 2.7 and 3.x would always point to the "current" docs...which means that before this fix python 3.2 'help' pointed to the 2.7 tutorial, and without this fix when we switch over to the 3.x docs being current, 2.7 would have pointed to the python3 tutorial. files: Lib/pydoc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1799,7 +1799,7 @@ Welcome to Python %s! This is the online help utility. If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/tutorial/. +the tutorial on the Internet at http://docs.python.org/%s/tutorial/. Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1809,7 +1809,7 @@ "keywords", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose summaries contain a given word such as "spam", type "modules spam". -''' % sys.version[:3]) +''' % tuple([sys.version[:3]]*2)) def list(self, items, columns=4, width=80): items = items[:] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge #14434: make tutorial link in 'help' banner version-specific
by r.david.murray March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/ee9b6574b497 changeset: 76016:ee9b6574b497 parent: 76014:a51764ed57a2 parent: 76015:d478c0a68bcb user: R David Murray <rdmurray(a)bitdance.com> date: Sat Mar 31 12:08:59 2012 -0400 summary: Merge #14434: make tutorial link in 'help' banner version-specific Without this fix, both 2.7 and 3.x would always point to the "current" docs...which means that before this fix python 3.2 'help' pointed to the 2.7 tutorial. files: Lib/pydoc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1826,7 +1826,7 @@ Welcome to Python %s! This is the online help utility. If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/tutorial/. +the tutorial on the Internet at http://docs.python.org/%s/tutorial/. Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1836,7 +1836,7 @@ "keywords", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose summaries contain a given word such as "spam", type "modules spam". -''' % sys.version[:3]) +''' % tuple([sys.version[:3]]*2)) def list(self, items, columns=4, width=80): items = list(sorted(items)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #14434: make tutorial link in 'help' banner version-specific
by r.david.murray March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/d478c0a68bcb changeset: 76015:d478c0a68bcb branch: 3.2 parent: 76013:722ce1be9eeb user: R David Murray <rdmurray(a)bitdance.com> date: Sat Mar 31 12:06:35 2012 -0400 summary: #14434: make tutorial link in 'help' banner version-specific Without this fix, both 2.7 and 3.x would always point to the "current" docs...which means that before this fix python 3.2 'help' pointed to the 2.7 tutorial. files: Lib/pydoc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1829,7 +1829,7 @@ Welcome to Python %s! This is the online help utility. If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/tutorial/. +the tutorial on the Internet at http://docs.python.org/%s/tutorial/. Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1839,7 +1839,7 @@ "keywords", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose summaries contain a given word such as "spam", type "modules spam". -''' % sys.version[:3]) +''' % tuple([sys.version[:3]]*2)) def list(self, items, columns=4, width=80): items = list(sorted(items)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge with 3.2
by sandro.tosi March 31, 2012

March 31, 2012

http://hg.python.org/cpython/rev/a51764ed57a2 changeset: 76014:a51764ed57a2 parent: 76011:e46013f92013 parent: 76013:722ce1be9eeb user: Sandro Tosi <sandro.tosi(a)gmail.com> date: Sat Mar 31 17:44:33 2012 +0200 summary: merge with 3.2 files: Doc/library/webbrowser.rst | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -137,6 +137,8 @@ +------------------------+-----------------------------------------+-------+ | ``'macosx'`` | :class:`MacOSX('default')` | \(4) | +------------------------+-----------------------------------------+-------+ +| ``'safari'`` | :class:`MacOSX('safari')` | \(4) | ++------------------------+-----------------------------------------+-------+ | ``'google-chrome'`` | :class:`Chrome('google-chrome')` | | +------------------------+-----------------------------------------+-------+ | ``'chrome'`` | :class:`Chrome('chrome')` | | -- Repository URL: http://hg.python.org/cpython

1 0