Mailman 3 December 2012 - Python-checkins

peps: PEP 432 syntax fix
by nick.coghlan Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/peps/rev/001751ad90c2 changeset: 4642:001751ad90c2 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Mon Dec 31 01:12:03 2012 +1000 summary: PEP 432 syntax fix files: pep-0432.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pep-0432.txt b/pep-0432.txt --- a/pep-0432.txt +++ b/pep-0432.txt @@ -730,10 +730,12 @@ incomplete: * ``sys.argv[0]`` may not yet have its final value + * it will be ``-m`` when executing a module or package with CPython * it will be the same as ``sys.path[0]`` rather than the location of the ``__main__`` module when executing a valid ``sys.path`` entry (typically a zipfile or directory) + * the metadata in the ``__main__`` module will still indicate it is a builtin module -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.3 -> default): Skip a test correctly for the C-version. The decorator doesn't really work
by eli.bendersky Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/08c215115842 changeset: 81154:08c215115842 parent: 81152:5a38f4d7833c parent: 81153:e2cce1100bd3 user: Eli Bendersky <eliben(a)gmail.com> date: Sun Dec 30 06:29:49 2012 -0800 summary: Skip a test correctly for the C-version. The decorator doesn't really work because it evaluates its condition before pyET is even set by test_main. Therefore, the check it moved to "runtime". files: Lib/test/test_xml_etree.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -2420,8 +2420,11 @@ # -------------------------------------------------------------------- -(a)unittest.skipUnless(pyET, 'only for the Python version') class NoAcceleratorTest(unittest.TestCase): + def setUp(self): + if not pyET: + raise SkipTest('only for the Python version') + # Test that the C accelerator was not imported for pyET def test_correct_import_pyET(self): self.assertEqual(pyET.Element.__module__, 'xml.etree.ElementTree') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Skip a test correctly for the C-version. The decorator doesn't really work
by eli.bendersky Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/e2cce1100bd3 changeset: 81153:e2cce1100bd3 branch: 3.3 parent: 81151:71508fc738bb user: Eli Bendersky <eliben(a)gmail.com> date: Sun Dec 30 06:27:56 2012 -0800 summary: Skip a test correctly for the C-version. The decorator doesn't really work because it evaluates its condition before pyET is even set by test_main. Therefore, the check it moved to "runtime". files: Lib/test/test_xml_etree.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -2420,8 +2420,11 @@ # -------------------------------------------------------------------- -(a)unittest.skipUnless(pyET, 'only for the Python version') class NoAcceleratorTest(unittest.TestCase): + def setUp(self): + if not pyET: + raise SkipTest('only for the Python version') + # Test that the C accelerator was not imported for pyET def test_correct_import_pyET(self): self.assertEqual(pyET.Element.__module__, 'xml.etree.ElementTree') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): For issue #16076: merge 3.3
by eli.bendersky Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/5a38f4d7833c changeset: 81152:5a38f4d7833c parent: 81150:c59ee1ff6f27 parent: 81151:71508fc738bb user: Eli Bendersky <eliben(a)gmail.com> date: Sun Dec 30 06:18:19 2012 -0800 summary: For issue #16076: merge 3.3 files: Lib/test/test_xml_etree.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -16,6 +16,7 @@ import html import io +import pickle import sys import unittest import weakref @@ -1768,6 +1769,20 @@ self.assertEqual(flag, True) self.assertEqual(wref(), None) + def test_pickle(self): + # For now this test only works for the Python version of ET, + # so set sys.modules accordingly because pickle uses __import__ + # to load the __module__ of the class. + if pyET: + sys.modules['xml.etree.ElementTree'] = pyET + else: + raise unittest.SkipTest('only for the Python version') + e1 = ET.Element('foo', bar=42) + s = pickle.dumps(e1) + e2 = pickle.loads(s) + self.assertEqual(e2.tag, 'foo') + self.assertEqual(e2.attrib['bar'], 42) + class ElementTreeTest(unittest.TestCase): def test_istype(self): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): For Issue #16076: make sure that pickling of Element objects is tested, and do
by eli.bendersky Dec. 30, 2012

Dec. 30, 2012

http://hg.python.org/cpython/rev/71508fc738bb changeset: 81151:71508fc738bb branch: 3.3 parent: 81149:44a4f9289faa user: Eli Bendersky <eliben(a)gmail.com> date: Sun Dec 30 06:17:49 2012 -0800 summary: For Issue #16076: make sure that pickling of Element objects is tested, and do it properly to avoid problems with test-run-order dependencies. files: Lib/test/test_xml_etree.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -16,6 +16,7 @@ import html import io +import pickle import sys import unittest import weakref @@ -1768,6 +1769,20 @@ self.assertEqual(flag, True) self.assertEqual(wref(), None) + def test_pickle(self): + # For now this test only works for the Python version of ET, + # so set sys.modules accordingly because pickle uses __import__ + # to load the __module__ of the class. + if pyET: + sys.modules['xml.etree.ElementTree'] = pyET + else: + raise unittest.SkipTest('only for the Python version') + e1 = ET.Element('foo', bar=42) + s = pickle.dumps(e1) + e2 = pickle.loads(s) + self.assertEqual(e2.tag, 'foo') + self.assertEqual(e2.attrib['bar'], 42) + class ElementTreeTest(unittest.TestCase): def test_istype(self): -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (c59ee1ff6f27): sum=-1
by solipsis＠pitrou.net Dec. 30, 2012

Dec. 30, 2012

results for c59ee1ff6f27 on branch "default" -------------------------------------------- test_support leaked [0, 0, -1] references, sum=-1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogh56coy', '-x']

1 0

cpython (3.3): Issue #16165: Fix sched.scheduler.run() method was block a scheduler for
by serhiy.storchaka Dec. 29, 2012

Dec. 29, 2012

http://hg.python.org/cpython/rev/467c46e312eb changeset: 81136:467c46e312eb branch: 3.3 parent: 81134:1c9c0f92df65 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Dec 29 21:34:11 2012 +0200 summary: Issue #16165: Fix sched.scheduler.run() method was block a scheduler for other threads. files: Lib/sched.py | 40 +++++++++++++++-------------- Lib/test/test_sched.py | 37 +++++++++++++++++++++++++++- Misc/NEWS | 3 ++ 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/Lib/sched.py b/Lib/sched.py --- a/Lib/sched.py +++ b/Lib/sched.py @@ -128,27 +128,29 @@ """ # localize variable access to minimize overhead # and to improve thread safety - with self._lock: - q = self._queue - delayfunc = self.delayfunc - timefunc = self.timefunc - pop = heapq.heappop - while q: - time, priority, action, argument, kwargs = checked_event = q[0] + lock = self._lock + q = self._queue + delayfunc = self.delayfunc + timefunc = self.timefunc + pop = heapq.heappop + while True: + with lock: + if not q: + break + time, priority, action, argument, kwargs = q[0] now = timefunc() - if now < time: - if not blocking: - return time - now - delayfunc(time - now) + if time > now: + delay = True else: - event = pop(q) - # Verify that the event was not removed or altered - # by another thread after we last looked at q[0]. - if event is checked_event: - action(*argument, **kwargs) - delayfunc(0) # Let other threads run - else: - heapq.heappush(q, event) + delay = False + pop(q) + if delay: + if not blocking: + return time - now + delayfunc(time - now) + else: + action(*argument, **kwargs) + delayfunc(0) # Let other threads run @property def queue(self): diff --git a/Lib/test/test_sched.py b/Lib/test/test_sched.py --- a/Lib/test/test_sched.py +++ b/Lib/test/test_sched.py @@ -4,7 +4,10 @@ import time import unittest from test import support - +try: + import threading +except ImportError: + threading = None class TestCase(unittest.TestCase): @@ -26,6 +29,20 @@ scheduler.run() self.assertEqual(l, [0.01, 0.02, 0.03, 0.04, 0.05]) + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_enter_concurrent(self): + l = [] + fun = lambda x: l.append(x) + scheduler = sched.scheduler(time.time, time.sleep) + scheduler.enter(0.03, 1, fun, (0.03,)) + t = threading.Thread(target=scheduler.run) + t.start() + for x in [0.05, 0.04, 0.02, 0.01]: + z = scheduler.enter(x, 1, fun, (x,)) + scheduler.run() + t.join() + self.assertEqual(l, [0.01, 0.02, 0.03, 0.04, 0.05]) + def test_priority(self): l = [] fun = lambda x: l.append(x) @@ -50,6 +67,24 @@ scheduler.run() self.assertEqual(l, [0.02, 0.03, 0.04]) + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_cancel_concurrent(self): + l = [] + fun = lambda x: l.append(x) + scheduler = sched.scheduler(time.time, time.sleep) + now = time.time() + event1 = scheduler.enterabs(now + 0.01, 1, fun, (0.01,)) + event2 = scheduler.enterabs(now + 0.02, 1, fun, (0.02,)) + event3 = scheduler.enterabs(now + 0.03, 1, fun, (0.03,)) + event4 = scheduler.enterabs(now + 0.04, 1, fun, (0.04,)) + event5 = scheduler.enterabs(now + 0.05, 1, fun, (0.05,)) + t = threading.Thread(target=scheduler.run) + t.start() + scheduler.cancel(event1) + scheduler.cancel(event5) + t.join() + self.assertEqual(l, [0.02, 0.03, 0.04]) + def test_empty(self): l = [] fun = lambda x: l.append(x) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -124,6 +124,9 @@ Library ------- +- Issue #16165: Fix sched.scheduler.run() method was block a scheduler for + other threads. + - Issue #16641: Fix default values of sched.scheduler.enter arguments were modifiable. -- Repository URL: http://hg.python.org/cpython

2 1

cpython (merge 3.3 -> default): Issue #16688: Fix backreferences did make case-insensitive regex fail on
by serhiy.storchaka Dec. 29, 2012

Dec. 29, 2012

http://hg.python.org/cpython/rev/c59ee1ff6f27 changeset: 81150:c59ee1ff6f27 parent: 81148:a4b0e5241bef parent: 81149:44a4f9289faa user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Dec 29 23:41:08 2012 +0200 summary: Issue #16688: Fix backreferences did make case-insensitive regex fail on non-ASCII strings. Patch by Matthew Barnett. files: Lib/test/test_re.py | 5 +++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/_sre.c | 11 ++++++----- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -968,6 +968,11 @@ self.assertEqual(r, s) self.assertEqual(n, size + 1) + def test_bug_16688(self): + # Issue 16688: Backreferences make case-insensitive regex fail on + # non-ASCII strings. + self.assertEqual(re.findall(r"(?i)(a)\1", "aa \u0100"), ['a']) + self.assertEqual(re.match(r"(?s).{1,3}", "\u0100\u0100").span(), (0, 2)) def run_re_tests(): from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -70,6 +70,7 @@ Nick Barnes Quentin Barnes David Barnett +Matthew Barnett Richard Barran Cesar Eduardo Barros Des Barry diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,9 @@ Library ------- +- Issue #16688: Fix backreferences did make case-insensitive regex fail on + non-ASCII strings. Patch by Matthew Barnett. + - Issue #16486: Make aifc files work with 'with' as context managers. - Issue #16485: Fix file descriptor not being closed if file header patching diff --git a/Modules/_sre.c b/Modules/_sre.c --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -492,7 +492,7 @@ Py_ssize_t i; /* adjust end */ - if (maxcount < end - ptr && maxcount != 65535) + if (maxcount < (end - ptr) / state->charsize && maxcount != 65535) end = ptr + maxcount*state->charsize; switch (pattern[0]) { @@ -583,7 +583,7 @@ Py_ssize_t i; /* check minimal length */ - if (pattern[3] && (end - ptr) < pattern[3]) + if (pattern[3] && (end - ptr)/state->charsize < pattern[3]) return 0; /* check known prefix */ @@ -801,7 +801,7 @@ /* <INFO> <1=skip> <2=flags> <3=min> ... */ if (ctx->pattern[3] && (end - ctx->ptr)/state->charsize < ctx->pattern[3]) { TRACE(("reject (got %d chars, need %d)\n", - (end - ctx->ptr), ctx->pattern[3])); + (end - ctx->ptr)/state->charsize, ctx->pattern[3])); RETURN_FAILURE; } ctx->pattern += ctx->pattern[1] + 1; @@ -1329,9 +1329,10 @@ RETURN_FAILURE; while (p < e) { if (ctx->ptr >= end || - state->lower(SRE_CHARGET(state, ctx->ptr, 0)) != state->lower(*p)) + state->lower(SRE_CHARGET(state, ctx->ptr, 0)) != + state->lower(SRE_CHARGET(state, p, 0))) RETURN_FAILURE; - p++; + p += state->charsize; ctx->ptr += state->charsize; } } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #16688: Fix backreferences did make case-insensitive regex fail on
by serhiy.storchaka Dec. 29, 2012

Dec. 29, 2012

http://hg.python.org/cpython/rev/44a4f9289faa changeset: 81149:44a4f9289faa branch: 3.3 parent: 81145:e9cbe583156f user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sat Dec 29 23:38:48 2012 +0200 summary: Issue #16688: Fix backreferences did make case-insensitive regex fail on non-ASCII strings. Patch by Matthew Barnett. files: Lib/test/test_re.py | 5 +++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/_sre.c | 11 ++++++----- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -968,6 +968,11 @@ self.assertEqual(r, s) self.assertEqual(n, size + 1) + def test_bug_16688(self): + # Issue 16688: Backreferences make case-insensitive regex fail on + # non-ASCII strings. + self.assertEqual(re.findall(r"(?i)(a)\1", "aa \u0100"), ['a']) + self.assertEqual(re.match(r"(?s).{1,3}", "\u0100\u0100").span(), (0, 2)) def run_re_tests(): from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -70,6 +70,7 @@ Nick Barnes Quentin Barnes David Barnett +Matthew Barnett Richard Barran Cesar Eduardo Barros Des Barry diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -124,6 +124,9 @@ Library ------- +- Issue #16688: Fix backreferences did make case-insensitive regex fail on + non-ASCII strings. Patch by Matthew Barnett. + - Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file. diff --git a/Modules/_sre.c b/Modules/_sre.c --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -492,7 +492,7 @@ Py_ssize_t i; /* adjust end */ - if (maxcount < end - ptr && maxcount != 65535) + if (maxcount < (end - ptr) / state->charsize && maxcount != 65535) end = ptr + maxcount*state->charsize; switch (pattern[0]) { @@ -583,7 +583,7 @@ Py_ssize_t i; /* check minimal length */ - if (pattern[3] && (end - ptr) < pattern[3]) + if (pattern[3] && (end - ptr)/state->charsize < pattern[3]) return 0; /* check known prefix */ @@ -801,7 +801,7 @@ /* <INFO> <1=skip> <2=flags> <3=min> ... */ if (ctx->pattern[3] && (end - ctx->ptr)/state->charsize < ctx->pattern[3]) { TRACE(("reject (got %d chars, need %d)\n", - (end - ctx->ptr), ctx->pattern[3])); + (end - ctx->ptr)/state->charsize, ctx->pattern[3])); RETURN_FAILURE; } ctx->pattern += ctx->pattern[1] + 1; @@ -1329,9 +1329,10 @@ RETURN_FAILURE; while (p < e) { if (ctx->ptr >= end || - state->lower(SRE_CHARGET(state, ctx->ptr, 0)) != state->lower(*p)) + state->lower(SRE_CHARGET(state, ctx->ptr, 0)) != + state->lower(SRE_CHARGET(state, p, 0))) RETURN_FAILURE; - p++; + p += state->charsize; ctx->ptr += state->charsize; } } -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge heads
by andrew.svetlov Dec. 29, 2012

Dec. 29, 2012

http://hg.python.org/cpython/rev/a4b0e5241bef changeset: 81148:a4b0e5241bef parent: 81146:2cae7bde45ef parent: 81143:9beb11071dd1 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Sat Dec 29 23:11:20 2012 +0200 summary: merge heads files: Doc/library/aifc.rst | 4 ++++ Lib/aifc.py | 12 ++++++++++++ Lib/test/test_aifc.py | 12 ++++++++++++ Misc/NEWS | 2 ++ 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/Doc/library/aifc.rst b/Doc/library/aifc.rst --- a/Doc/library/aifc.rst +++ b/Doc/library/aifc.rst @@ -51,6 +51,10 @@ used for writing, the file object should be seekable, unless you know ahead of time how many samples you are going to write in total and use :meth:`writeframesraw` and :meth:`setnframes`. + Objects returned by :func:`.open` also supports the :keyword:`with` statement. + +.. versionchanged:: 3.4 + Support for the :keyword:`with` statement was added. Objects returned by :func:`.open` when a file is opened for reading have the following methods: diff --git a/Lib/aifc.py b/Lib/aifc.py --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -334,6 +334,12 @@ # else, assume it is an open file object already self.initfp(f) + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + # # User visible methods. # @@ -553,6 +559,12 @@ def __del__(self): self.close() + def __enter__(self): + return self + + def __exit__(self, *args): + self.close() + # # User visible methods. # diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py --- a/Lib/test/test_aifc.py +++ b/Lib/test/test_aifc.py @@ -43,6 +43,18 @@ (2, 2, 48000, 14400, b'NONE', b'not compressed'), ) + def test_context_manager(self): + with open(self.sndfilepath, 'rb') as testfile: + with aifc.open(testfile) as f: + pass + self.assertEqual(testfile.closed, True) + with open(TESTFN, 'wb') as testfile: + with self.assertRaises(aifc.Error): + with aifc.open(testfile, 'wb') as fout: + pass + self.assertEqual(testfile.closed, True) + fout.close() # do nothing + def test_read(self): f = self.f = aifc.open(self.sndfilepath) self.assertEqual(f.readframes(0), b'') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,8 @@ Library ------- +- Issue #16486: Make aifc files work with 'with' as context managers. + - Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file. -- Repository URL: http://hg.python.org/cpython

1 0