Mailman 3 March 2013 - Python-checkins

cpython (2.7): Add an itertools recipe showing how to use t.__copy__().
by raymond.hettinger March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/1026b1d47f30 changeset: 83037:1026b1d47f30 branch: 2.7 parent: 83034:e044d22d2f61 user: Raymond Hettinger <python(a)rcn.com> date: Sat Mar 30 23:37:57 2013 -0700 summary: Add an itertools recipe showing how to use t.__copy__(). files: Doc/library/itertools.rst | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -828,6 +828,18 @@ indices = sorted(random.randrange(n) for i in xrange(r)) return tuple(pool[i] for i in indices) + def tee_lookahead(t, i): + """Inspect the i-th upcomping value from a tee object + while leaving the tee object at its current position. + + Raise an IndexError if the underlying iterator doesn't + have enough values. + + """ + for value in islice(t.__copy__(), i, None): + return value + raise IndexError(i) + Note, many of the above recipes can be optimized by replacing global lookups with local variables defined as default values. For example, the *dotproduct* recipe can be written as:: -- Repository URL: http://hg.python.org/cpython

2 1

cpython (merge default -> default): Merge heads.
by roger.serwy March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/7a3cafe49592 changeset: 83047:7a3cafe49592 parent: 83043:58fcd81acfb1 parent: 83046:6ad256175971 user: Roger Serwy <roger.serwy(a)gmail.com> date: Sun Mar 31 16:11:51 2013 -0500 summary: Merge heads. files: Lib/idlelib/MultiCall.py | 5 +++-- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -170,8 +170,9 @@ break ishandlerrunning[:] = [] # Call all functions in doafterhandler and remove them from list - while doafterhandler: - doafterhandler.pop()() + for f in doafterhandler: + f() + doafterhandler[:] = [] if r: return r return handler diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -297,6 +297,9 @@ Library ------- +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. - Issue #17435: threading.Timer's __init__ method no longer uses mutable -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): #8900: merge with 3.3.
by roger.serwy March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/6ad256175971 changeset: 83046:6ad256175971 parent: 83042:0c9415ddf403 parent: 83045:61092bbd1464 user: Roger Serwy <roger.serwy(a)gmail.com> date: Sun Mar 31 15:56:02 2013 -0500 summary: #8900: merge with 3.3. files: Lib/idlelib/MultiCall.py | 5 +++-- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -170,8 +170,9 @@ break ishandlerrunning[:] = [] # Call all functions in doafterhandler and remove them from list - while doafterhandler: - doafterhandler.pop()() + for f in doafterhandler: + f() + doafterhandler[:] = [] if r: return r return handler diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -297,6 +297,9 @@ Library ------- +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. - Issue #17435: threading.Timer's __init__ method no longer uses mutable -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): #8900: Using keyboard shortcuts in IDLE to open a file no longer raises an
by roger.serwy March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/61092bbd1464 changeset: 83045:61092bbd1464 branch: 3.3 parent: 83041:96776fc3cbcc user: Roger Serwy <roger.serwy(a)gmail.com> date: Sun Mar 31 15:53:08 2013 -0500 summary: #8900: Using keyboard shortcuts in IDLE to open a file no longer raises an exception. files: Lib/idlelib/MultiCall.py | 5 +++-- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -170,8 +170,9 @@ break ishandlerrunning[:] = [] # Call all functions in doafterhandler and remove them from list - while doafterhandler: - doafterhandler.pop()() + for f in doafterhandler: + f() + doafterhandler[:] = [] if r: return r return handler diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,9 @@ Library ------- +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. - Issue #17435: threading.Timer's __init__ method no longer uses mutable -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #8900: Using keyboard shortcuts in IDLE to open a file no longer raises an
by roger.serwy March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/37352a3ccd54 changeset: 83044:37352a3ccd54 branch: 2.7 parent: 83040:cfd4cd15809e user: Roger Serwy <roger.serwy(a)gmail.com> date: Sun Mar 31 15:53:08 2013 -0500 summary: #8900: Using keyboard shortcuts in IDLE to open a file no longer raises an exception. files: Lib/idlelib/MultiCall.py | 5 +++-- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/MultiCall.py --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/MultiCall.py @@ -171,8 +171,9 @@ break ishandlerrunning[:] = [] # Call all functions in doafterhandler and remove them from list - while doafterhandler: - doafterhandler.pop()() + for f in doafterhandler: + f() + doafterhandler[:] = [] if r: return r return handler diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ Library ------- +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + - Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. - Issue #17526: fix an IndexError raised while passing code without filename to -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #17591: Use lowercase filenames when including Windows header files.
by antoine.pitrou March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/58fcd81acfb1 changeset: 83043:58fcd81acfb1 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Mar 31 22:48:04 2013 +0200 summary: Issue #17591: Use lowercase filenames when including Windows header files. Patch by Roumen Petrov. files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/signalmodule.c | 2 +- Objects/exceptions.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -943,6 +943,7 @@ Benjamin Peterson Joe Peterson Chris Petrilli +Roumen Petrov Bjorn Pettersen Justin D. Pettit Ronny Pfannschmidt diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1163,6 +1163,9 @@ Build ----- +- Issue #17591: Use lowercase filenames when including Windows header files. + Patch by Roumen Petrov. + - Issue #17550: Fix the --enable-profiling configure switch. - Issue #17425: Build with openssl 1.0.1d on Windows. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -9,7 +9,7 @@ #endif #ifdef MS_WINDOWS -#include <Windows.h> +#include <windows.h> #ifdef HAVE_PROCESS_H #include <process.h> #endif diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -2327,7 +2327,7 @@ } #ifdef MS_WINDOWS -#include <Winsock2.h> +#include <winsock2.h> /* The following constants were added to errno.h in VS2010 but have preferred WSA equivalents. */ #undef EADDRINUSE -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #6419: Fix a test_kqueue failure on some BSD flavors.
by charles-francois.natali March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/0c9415ddf403 changeset: 83042:0c9415ddf403 parent: 83039:fcb6c7119899 parent: 83041:96776fc3cbcc user: Charles-Francois Natali <cf.natali(a)gmail.com> date: Sun Mar 31 20:37:34 2013 +0200 summary: Issue #6419: Fix a test_kqueue failure on some BSD flavors. files: Lib/test/test_kqueue.py | 35 ++++++++++------------------ 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -101,11 +101,6 @@ pass # FreeBSD doesn't raise an exception here server, addr = serverSocket.accept() - if sys.platform.startswith("darwin"): - flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE - else: - flags = 0 - kq = select.kqueue() kq2 = select.kqueue.fromfd(kq.fileno()) @@ -127,11 +122,10 @@ kq2.control([ev], 0) events = kq.control(None, 4, 1) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_WRITE)])) client.send(b"Hello!") server.send(b"world!!!") @@ -145,14 +139,12 @@ else: self.fail('timeout waiting for event notifications') - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (client.fileno(), select.KQ_FILTER_READ, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_READ, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (client.fileno(), select.KQ_FILTER_READ), + (server.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_READ)])) # Remove completely client, and server read part ev = select.kevent(client.fileno(), @@ -169,10 +161,9 @@ kq.control([ev], 0, 0) events = kq.control([], 4, 0.99) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (server.fileno(), select.KQ_FILTER_WRITE)])) client.close() server.close() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #6419: Fix a test_kqueue failure on some BSD flavors.
by charles-francois.natali March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/96776fc3cbcc changeset: 83041:96776fc3cbcc branch: 3.3 parent: 83038:8324e63fc7a2 user: Charles-Francois Natali <cf.natali(a)gmail.com> date: Sun Mar 31 20:36:57 2013 +0200 summary: Issue #6419: Fix a test_kqueue failure on some BSD flavors. files: Lib/test/test_kqueue.py | 35 ++++++++++------------------ 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -101,11 +101,6 @@ pass # FreeBSD doesn't raise an exception here server, addr = serverSocket.accept() - if sys.platform.startswith("darwin"): - flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE - else: - flags = 0 - kq = select.kqueue() kq2 = select.kqueue.fromfd(kq.fileno()) @@ -127,11 +122,10 @@ kq2.control([ev], 0) events = kq.control(None, 4, 1) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_WRITE)])) client.send(b"Hello!") server.send(b"world!!!") @@ -145,14 +139,12 @@ else: self.fail('timeout waiting for event notifications') - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (client.fileno(), select.KQ_FILTER_READ, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_READ, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (client.fileno(), select.KQ_FILTER_READ), + (server.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_READ)])) # Remove completely client, and server read part ev = select.kevent(client.fileno(), @@ -169,10 +161,9 @@ kq.control([ev], 0, 0) events = kq.control([], 4, 0.99) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (server.fileno(), select.KQ_FILTER_WRITE)])) client.close() server.close() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #6419: Fix a test_kqueue failure on some BSD flavors.
by charles-francois.natali March 31, 2013

March 31, 2013

http://hg.python.org/cpython/rev/cfd4cd15809e changeset: 83040:cfd4cd15809e branch: 2.7 parent: 83037:1026b1d47f30 user: Charles-Francois Natali <cf.natali(a)gmail.com> date: Sun Mar 31 20:35:59 2013 +0200 summary: Issue #6419: Fix a test_kqueue failure on some BSD flavors. files: Lib/test/test_kqueue.py | 35 ++++++++++------------------ 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -96,11 +96,6 @@ pass # FreeBSD doesn't raise an exception here server, addr = serverSocket.accept() - if sys.platform.startswith("darwin"): - flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE - else: - flags = 0 - kq = select.kqueue() kq2 = select.kqueue.fromfd(kq.fileno()) @@ -122,11 +117,10 @@ kq2.control([ev], 0) events = kq.control(None, 4, 1) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_WRITE)])) client.send("Hello!") server.send("world!!!") @@ -140,14 +134,12 @@ else: self.fail('timeout waiting for event notifications') - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - - self.assertEqual(events, [ - (client.fileno(), select.KQ_FILTER_WRITE, flags), - (client.fileno(), select.KQ_FILTER_READ, flags), - (server.fileno(), select.KQ_FILTER_WRITE, flags), - (server.fileno(), select.KQ_FILTER_READ, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (client.fileno(), select.KQ_FILTER_WRITE), + (client.fileno(), select.KQ_FILTER_READ), + (server.fileno(), select.KQ_FILTER_WRITE), + (server.fileno(), select.KQ_FILTER_READ)])) # Remove completely client, and server read part ev = select.kevent(client.fileno(), @@ -164,10 +156,9 @@ kq.control([ev], 0, 0) events = kq.control([], 4, 0.99) - events = [(e.ident, e.filter, e.flags) for e in events] - events.sort() - self.assertEqual(events, [ - (server.fileno(), select.KQ_FILTER_WRITE, flags)]) + events = set((e.ident, e.filter) for e in events) + self.assertEqual(events, set([ + (server.fileno(), select.KQ_FILTER_WRITE)])) client.close() server.close() -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Clarify policy for security branches. List RMs for active branches.
by georg.brandl March 31, 2013

March 31, 2013

http://hg.python.org/devguide/rev/3b30c415c9a5 changeset: 616:3b30c415c9a5 user: Georg Brandl <georg(a)python.org> date: Sun Mar 31 19:46:14 2013 +0200 summary: Clarify policy for security branches. List RMs for active branches. files: devcycle.rst | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/devcycle.rst b/devcycle.rst --- a/devcycle.rst +++ b/devcycle.rst @@ -93,10 +93,13 @@ The only changes made to a security branch are those fixing issues exploitable by attackers such as crashes, privilege escalation and, optionally, other -issues such as denial of service attacks. Other behavioral issues are +issues such as denial of service attacks. Any other changes are **not** considered a security risk and thus not backported to a security branch. -Any release made from a security branch is source-only and done only when -actual security patches have been applied to the branch. + +Commits to security branches are to be coordinated with the release manager +for the corresponding feature version, as listed below in the Summary_. +Any release made from a security branch is source-only and done only when actual +security patches have been applied to the branch. .. _listbranch: @@ -104,16 +107,20 @@ Summary ------- -There are 6 open branches right now in the Mercurial repository: +There are 6 active branches right now in the Mercurial repository: - the ``default`` branch holds the future 3.4 version and descends from ``3.3`` + (future RM: Larry Hastings) - the ``3.3`` branch holds bug fixes for future 3.3.x maintenance releases - and descends from ``3.2`` + and descends from ``3.2`` (RM: Georg Brandl) - the ``3.2`` branch holds security fixes for future 3.2.x security releases + (RM: Georg Brandl) - the ``3.1`` branch holds security fixes for future 3.1.x security releases + (RM: Benjamin Peterson) - the ``2.7`` branch holds bug fixes for future 2.7.x maintenance releases and - descends from ``2.6`` + descends from ``2.6`` (RM: Benjamin Peterson) - the ``2.6`` branch holds security fixes for future 2.6.x security releases + (RM: Barry Warsaw) .. _stages: -- Repository URL: http://hg.python.org/devguide

1 0