Mailman 3 January 2012 - Python-checkins

peps: Add PEP 409.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/peps/rev/caa64c650757 changeset: 4029:caa64c650757 user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 09:44:19 2012 +0100 summary: Add PEP 409. files: pep-0398.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -77,6 +77,7 @@ * PEP 382: Namespace Packages * PEP 395: Module Aliasing * PEP 397: Python launcher for Windows +* PEP 409: Suppressing exception context * PEP 3143: Standard daemon process library (Note that these are not accepted yet and even if they are, they might -- Repository URL: http://hg.python.org/peps

1 0

peps: Style updates to PEP 409.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/peps/rev/c1ed6327769a changeset: 4028:c1ed6327769a user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 09:41:13 2012 +0100 summary: Style updates to PEP 409. files: pep-0409.txt | 78 +++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 36 deletions(-) diff --git a/pep-0409.txt b/pep-0409.txt --- a/pep-0409.txt +++ b/pep-0409.txt @@ -14,51 +14,54 @@ Abstract ======== -One of the open issues from PEP 3134 is suppressing context: currently there is -no way to do it. This PEP proposes one. +One of the open issues from PEP 3134 is suppressing context: currently +there is no way to do it. This PEP proposes one. + Motivation ========== -There are two basic ways to generate exceptions: 1) Python does it (buggy code, -missing resources, ending loops, etc.); and, 2) manually (with a raise -statement). +There are two basic ways to generate exceptions: 1) Python does it +(buggy code, missing resources, ending loops, etc.); and, 2) manually +(with a raise statement). -When writing libraries, or even just custom classes, it can become necessary to -raise exceptions; moreover it can be useful, even necessary, to change from one -exception to another. To take an example from my dbf module: +When writing libraries, or even just custom classes, it can become +necessary to raise exceptions; moreover it can be useful, even +necessary, to change from one exception to another. To take an +example from my dbf module:: try: value = int(value) except Exception: raise DbfError(...) -Whatever the original exception was (ValueError, TypeError, or something else) -is irrelevant. The exception from this point on is a DbfError, and the original -exception is of no value. However, if this exception is printed, we would -currently see both. +Whatever the original exception was (ValueError, TypeError, or +something else) is irrelevant. The exception from this point on is a +DbfError, and the original exception is of no value. However, if this +exception is printed, we would currently see both. Alternatives ============ + Several possibilities have been put forth: - - raise as NewException() +- ``raise as NewException()`` - Reuses the 'as' keyword; can be confusing since we are not really reraising - the originating exception + Reuses the 'as' keyword; can be confusing since we are not really reraising + the originating exception - - raise NewException() from None +- ``raise NewException() from None`` - Follows existing syntax of explicitly declaring the originating exception + Follows existing syntax of explicitly declaring the originating exception - - exc = NewException(); exc.__context__ = None; raise exc +- ``exc = NewException(); exc.__context__ = None; raise exc`` - Very verbose way of the previous method + Very verbose way of the previous method - - raise NewException.no_context(...) +- ``raise NewException.no_context(...)`` - Make context suppression a class method. + Make context suppression a class method. All of the above options will require changes to the core. @@ -66,17 +69,18 @@ Proposal ======== -I proprose going with the second option: +I proprose going with the second option:: - raise NewException from None + raise NewException from None -It has the advantage of using the existing pattern of explicitly setting -the cause: +It has the advantage of using the existing pattern of explicitly +setting the cause:: - raise KeyError() from NameError() + raise KeyError() from NameError() -but because the 'cause' is None the previous context is discarded. There is a -patch to this effect attached to issue 6210 [#issue6210]_. +but because the 'cause' is None the previous context is discarded. +There is a patch to this effect attached to issue 6210 [#issue6210]_. + References ========== @@ -84,17 +88,19 @@ .. [#issue6210] http://bugs.python.org/issue6210 + Copyright ========= This document has been placed in the public domain. - + + .. - Local Variables: - mode: indented-text - indent-tabs-mode: nil - sentence-end-double-space: t - fill-column: 70 - coding: utf-8 - End: + Local Variables: + mode: indented-text + indent-tabs-mode: nil + sentence-end-double-space: t + fill-column: 70 + coding: utf-8 + End: -- Repository URL: http://hg.python.org/peps

1 0

peps: PEP 399 is already there and final.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/peps/rev/7c0e1d694bfe changeset: 4027:7c0e1d694bfe user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 07:39:39 2012 +0100 summary: PEP 399 is already there and final. files: pep-0398.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -57,10 +57,11 @@ Features for 3.3 ================ -Implemented PEPs: +Implemented / Final PEPs: * PEP 380: Syntax for Delegating to a Subgenerator * PEP 393: Flexible String Representation +* PEP 399: Pure Python/C Accelerator Module Compatibility Requirements * PEP 3151: Reworking the OS and IO exception hierarchy * PEP 3155: Qualified name for classes and functions @@ -83,12 +84,11 @@ Other planned large-scale changes: +* Addition of the "regex" module +* Email version 6 * Implementing ``__import__`` using importlib -* Email version 6 * A standard event-loop interface (PEP by Jim Fulton pending) * Breaking out standard library and docs in separate repos? -* A PEP on supplementing C modules with equivalent Python modules? -* Addition of the "regex" module Copyright -- Repository URL: http://hg.python.org/peps

1 0

peps: Add regex.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/peps/rev/773efb84a269 changeset: 4026:773efb84a269 user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 07:32:04 2012 +0100 summary: Add regex. files: pep-0398.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -67,8 +67,8 @@ Other final large-scale changes: * Addition of the "packaging" module, deprecating "distutils" -* Addition of the faulthandler module -* Addition of the lzma module, and lzma/xz support in tarfile +* Addition of the "faulthandler" module +* Addition of the "lzma" module, and lzma/xz support in tarfile Candidate PEPs: @@ -88,6 +88,7 @@ * A standard event-loop interface (PEP by Jim Fulton pending) * Breaking out standard library and docs in separate repos? * A PEP on supplementing C modules with equivalent Python modules? +* Addition of the "regex" module Copyright -- Repository URL: http://hg.python.org/peps

1 0

peps: Guido has rejected PEP 408
by nick.coghlan Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/peps/rev/fcf8ecbcf953 changeset: 4025:fcf8ecbcf953 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sun Jan 29 16:22:32 2012 +1000 summary: Guido has rejected PEP 408 files: pep-0408.txt | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/pep-0408.txt b/pep-0408.txt --- a/pep-0408.txt +++ b/pep-0408.txt @@ -4,12 +4,13 @@ Last-Modified: $Date$ Author: Nick Coghlan <ncoghlan(a)gmail.com>, Eli Bendersky <eliben(a)gmail.com> -Status: Draft +Status: Rejected Type: Standards Track Content-Type: text/x-rst Created: 2012-01-07 Python-Version: 3.3 Post-History: 2012-01-27 +Resolution: http://mail.python.org/pipermail/python-dev/2012-January/115962.html Abstract @@ -27,6 +28,25 @@ or to the stability of its API, which may change for the next release. +PEP Rejection +============= + +Based on his experience with a similar "labs" namespace in Google App Engine, +Guido has rejected this PEP [3] in favour of the simpler alternative of +explicitly marking provisional modules as such in their documentation. + +If a module is otherwise considered suitable for standard library inclusion, +but some concerns remain regarding maintainability or certain API details, +then the module can be accepted on a provisional basis. While it is considered +an unlikely outcome, such modules *may* be removed from the standard library +without a deprecation period if the lingering concerns prove well-founded. + +As part of the same announcement, Guido explicitly accepted Matthew +Barnett's 'regex' module [4] as a provisional addition to the standard +library for Python 3.3 (using the 'regex' name, rather than as a drop-in +replacement for the existing 're' module). + + Proposal - the __preview__ package ================================== @@ -275,6 +295,11 @@ .. [#] http://mail.python.org/pipermail/python-ideas/2011-August/011278.html +.. [#] Guido's decision: + http://mail.python.org/pipermail/python-dev/2012-January/115962.html + +.. [#] Proposal for inclusion of regex: http://bugs.python.org/issue2636 + Copyright ========= -- Repository URL: http://hg.python.org/peps

1 0

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

Jan. 29, 2012

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

1 0

cpython (2.7): remove tests from really old regex module
by benjamin.peterson Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/4c6662090870 changeset: 74675:4c6662090870 branch: 2.7 parent: 74672:f1ee3bb6ba64 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jan 28 20:33:21 2012 -0500 summary: remove tests from really old regex module files: Lib/test/regex_tests.py | 287 ---------------------------- 1 files changed, 0 insertions(+), 287 deletions(-) diff --git a/Lib/test/regex_tests.py b/Lib/test/regex_tests.py deleted file mode 100644 --- a/Lib/test/regex_tests.py +++ /dev/null @@ -1,287 +0,0 @@ -# Regex test suite and benchmark suite v1.5a2 -# Due to the use of r"aw" strings, this file will -# only work with Python 1.5 or higher. - -# The 3 possible outcomes for each pattern -[SUCCEED, FAIL, SYNTAX_ERROR] = range(3) - -# Benchmark suite (needs expansion) -# -# The benchmark suite does not test correctness, just speed. The -# first element of each tuple is the regex pattern; the second is a -# string to match it against. The benchmarking code will embed the -# second string inside several sizes of padding, to test how regex -# matching performs on large strings. - -benchmarks = [ - ('Python', 'Python'), # Simple text literal - ('.*Python', 'Python'), # Bad text literal - ('.*Python.*', 'Python'), # Worse text literal - ('.*\$Python\$', 'Python'), # Bad text literal with grouping - - ('(Python\\|Perl\\|Tcl', 'Perl'), # Alternation - ('\$Python\\|Perl\\|Tcl\$', 'Perl'), # Grouped alternation - ('\$Python\$\\1', 'PythonPython'), # Backreference -# ('\$[0a-z][a-z]*,\$+', 'a5,b7,c9,'), # Disable the fastmap optimization - ('\$[a-z][a-z0-9]*,\$+', 'a5,b7,c9,') # A few sets -] - -# Test suite (for verifying correctness) -# -# The test suite is a list of 5- or 3-tuples. The 5 parts of a -# complete tuple are: -# element 0: a string containing the pattern -# 1: the string to match against the pattern -# 2: the expected result (SUCCEED, FAIL, SYNTAX_ERROR) -# 3: a string that will be eval()'ed to produce a test string. -# This is an arbitrary Python expression; the available -# variables are "found" (the whole match), and "g1", "g2", ... -# up to "g10" contain the contents of each group, or the -# string 'None' if the group wasn't given a value. -# 4: The expected result of evaluating the expression. -# If the two don't match, an error is reported. -# -# If the regex isn't expected to work, the latter two elements can be omitted. - -tests = [ -('abc', 'abc', SUCCEED, - 'found', 'abc'), -('abc', 'xbc', FAIL), -('abc', 'axc', FAIL), -('abc', 'abx', FAIL), -('abc', 'xabcy', SUCCEED, - 'found', 'abc'), -('abc', 'ababc', SUCCEED, - 'found', 'abc'), -('ab*c', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab*bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab+bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab+bc', 'abc', FAIL), -('ab+bc', 'abq', FAIL), -('ab+bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab?bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab?bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab?bc', 'abbbbc', FAIL), -('ab?c', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abcc', FAIL), -('^abc', 'abcc', SUCCEED, - 'found', 'abc'), -('^abc$', 'aabc', FAIL), -('abc$', 'aabc', SUCCEED, - 'found', 'abc'), -('^', 'abc', SUCCEED, - 'found+"-"', '-'), -('$', 'abc', SUCCEED, - 'found+"-"', '-'), -('a.c', 'abc', SUCCEED, - 'found', 'abc'), -('a.c', 'axc', SUCCEED, - 'found', 'axc'), -('a.*c', 'axyzc', SUCCEED, - 'found', 'axyzc'), -('a.*c', 'axyzd', FAIL), -('a[bc]d', 'abc', FAIL), -('a[bc]d', 'abd', SUCCEED, - 'found', 'abd'), -('a[b-d]e', 'abd', FAIL), -('a[b-d]e', 'ace', SUCCEED, - 'found', 'ace'), -('a[b-d]', 'aac', SUCCEED, - 'found', 'ac'), -('a[-b]', 'a-', SUCCEED, - 'found', 'a-'), -('a[b-]', 'a-', SUCCEED, - 'found', 'a-'), -('a[]b', '-', SYNTAX_ERROR), -('a[', '-', SYNTAX_ERROR), -('a\\', '-', SYNTAX_ERROR), -('abc\\)', '-', SYNTAX_ERROR), -('\$abc', '-', SYNTAX_ERROR), -('a]', 'a]', SUCCEED, - 'found', 'a]'), -('a[]]b', 'a]b', SUCCEED, - 'found', 'a]b'), -('a[^bc]d', 'aed', SUCCEED, - 'found', 'aed'), -('a[^bc]d', 'abd', FAIL), -('a[^-b]c', 'adc', SUCCEED, - 'found', 'adc'), -('a[^-b]c', 'a-c', FAIL), -('a[^]b]c', 'a]c', FAIL), -('a[^]b]c', 'adc', SUCCEED, - 'found', 'adc'), -('\\ba\\b', 'a-', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a-', SUCCEED, - '"-"', '-'), -('\\by\\b', 'xy', FAIL), -('\\by\\b', 'yz', FAIL), -('\\by\\b', 'xyz', FAIL), -('ab\\|cd', 'abc', SUCCEED, - 'found', 'ab'), -('ab\\|cd', 'abcd', SUCCEED, - 'found', 'ab'), -('\\(\$ef', 'def', SUCCEED, - 'found+"-"+g1', 'ef-'), -('$b', 'b', FAIL), -('a(b', 'a(b', SUCCEED, - 'found+"-"+g1', 'a(b-None'), -('a(*b', 'ab', SUCCEED, - 'found', 'ab'), -('a(*b', 'a((b', SUCCEED, - 'found', 'a((b'), -('a\\\\b', 'a\\b', SUCCEED, - 'found', 'a\\b'), -('\$\\(a\$\\)', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'a-a-a'), -('\$a\$b\$c\$', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abc-a-c'), -('a+b+c', 'aabbabc', SUCCEED, - 'found', 'abc'), -('\$a+\\|b\$*', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$+', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$?', 'ab', SUCCEED, - 'found+"-"+g1', 'a-a'), -('\\)\$', '-', SYNTAX_ERROR), -('[^ab]*', 'cde', SUCCEED, - 'found', 'cde'), -('abc', '', FAIL), -('a*', '', SUCCEED, - 'found', ''), -('a\\|b\\|c\\|d\\|e', 'e', SUCCEED, - 'found', 'e'), -('\\(a\\|b\\|c\\|d\\|e\$f', 'ef', SUCCEED, - 'found+"-"+g1', 'ef-e'), -('abcd*efg', 'abcdefg', SUCCEED, - 'found', 'abcdefg'), -('ab*', 'xabyabbbz', SUCCEED, - 'found', 'ab'), -('ab*', 'xayabbbz', SUCCEED, - 'found', 'a'), -('\$ab\\|cd\$e', 'abcde', SUCCEED, - 'found+"-"+g1', 'cde-cd'), -('[abhgefdc]ij', 'hij', SUCCEED, - 'found', 'hij'), -('^\$ab\\|cd\$e', 'abcde', FAIL, - 'xg1y', 'xy'), -('\$abc\\|\$ef', 'abcdef', SUCCEED, - 'found+"-"+g1', 'ef-'), -('\$a\\|b\$c*d', 'abcd', SUCCEED, - 'found+"-"+g1', 'bcd-b'), -('\$ab\\|ab*\$bc', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-a'), -('a\$[bc]*\$c*', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-bc'), -('a\$[bc]*\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]+\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]*\$\$c+d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-b-cd'), -('a[bcd]*dcdcde', 'adcdcde', SUCCEED, - 'found', 'adcdcde'), -('a[bcd]+dcdcde', 'adcdcde', FAIL), -('\$ab\\|a\$b*c', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-ab'), -('\$\\(a\$\$b\$c\\)\$d\$', 'abcd', SUCCEED, - 'g1+"-"+g2+"-"+g3+"-"+g4', 'abc-a-b-d'), -('[a-zA-Z_][a-zA-Z0-9_]*', 'alpha', SUCCEED, - 'found', 'alpha'), -('^a\$bc+\\|b[eh]\$g\\|.h$', 'abh', SUCCEED, - 'found+"-"+g1', 'bh-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'ij', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ij-ij-j'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effg', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'bcdd', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'reffgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$\\(\\(\\(\\(\\(\\(\\(\\(a\$\\)\\)\\)\\)\\)\\)\\)\\)', 'a', SUCCEED, - 'found', 'a'), -('multiple words of text', 'uh-uh', FAIL), -('multiple words', 'multiple words, yeah', SUCCEED, - 'found', 'multiple words'), -('\$.*\$c\$.*\$', 'abcde', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcde-ab-de'), -('(\$.*\$, \$.*\$)', '(a, b)', SUCCEED, - 'g2+"-"+g1', 'b-a'), -('[k]', 'ab', FAIL), -('a[-]?c', 'ac', SUCCEED, - 'found', 'ac'), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('\$[a-c]*\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('^\$.+\$?B', 'AB', SUCCEED, - 'g1', 'A'), -('\$a+\$.\\1$', 'aaaaa', SUCCEED, - 'found+"-"+g1', 'aaaaa-aa'), -('^\$a+\$.\\1$', 'aaaa', FAIL), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$[a-c]+\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$+\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a\$.+\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$a\$ba*\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$aa\\|a\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a\\|aa\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a+\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$[abc]*\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\$b\$c\\|ab', 'ab', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ab-None-None'), -('\$a\$+x', 'aaax', SUCCEED, - 'found+"-"+g1', 'aaax-a'), -('\$[ac]\$+x', 'aacx', SUCCEED, - 'found+"-"+g1', 'aacx-c'), -('\$[^/]*/\$*sub1/', 'd:msgs/tdir/sub1/trial/away.cpp', SUCCEED, - 'found+"-"+g1', 'd:msgs/tdir/sub1/-tdir/'), -('\$[^.]*\$\\.\$[^:]*\$:[T ]+\$.*\$', 'track1.title:TBlah blah blah', SUCCEED, - 'found+"-"+g1+"-"+g2+"-"+g3', 'track1.title:TBlah blah blah-track1-title-Blah blah blah'), -('\$[^N]*N\$+', 'abNNxyzN', SUCCEED, - 'found+"-"+g1', 'abNNxyzN-xyzN'), -('\$[^N]*N\$+', 'abNNxyz', SUCCEED, - 'found+"-"+g1', 'abNN-N'), -('\$[abc]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'abcx-abc'), -('\$[abc]*\$x', 'abc', FAIL), -('\$[xyz]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'x-'), -('\$a\$+b\\|aac', 'aac', SUCCEED, - 'found+"-"+g1', 'aac-None'), -('\<a', 'a', SUCCEED, 'found', 'a'), -('\<a', '!', FAIL), -('a\<b', 'ab', FAIL), -('a\>', 'ab', FAIL), -('a\>', 'a!', SUCCEED, 'found', 'a'), -('a\>', 'a', SUCCEED, 'found', 'a'), -] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/aa214fefbdc1 changeset: 74674:aa214fefbdc1 parent: 74671:ce89dcba008f parent: 74673:4084b2c65dca user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jan 28 20:33:52 2012 -0500 summary: merge 3.2 files: Lib/test/regex_tests.py | 285 ---------------------------- 1 files changed, 0 insertions(+), 285 deletions(-) diff --git a/Lib/test/regex_tests.py b/Lib/test/regex_tests.py deleted file mode 100644 --- a/Lib/test/regex_tests.py +++ /dev/null @@ -1,285 +0,0 @@ -# Regex test suite and benchmark suite v1.5a2 - -# The 3 possible outcomes for each pattern -[SUCCEED, FAIL, SYNTAX_ERROR] = range(3) - -# Benchmark suite (needs expansion) -# -# The benchmark suite does not test correctness, just speed. The -# first element of each tuple is the regex pattern; the second is a -# string to match it against. The benchmarking code will embed the -# second string inside several sizes of padding, to test how regex -# matching performs on large strings. - -benchmarks = [ - ('Python', 'Python'), # Simple text literal - ('.*Python', 'Python'), # Bad text literal - ('.*Python.*', 'Python'), # Worse text literal - ('.*\$Python\$', 'Python'), # Bad text literal with grouping - - ('(Python\\|Perl\\|Tcl', 'Perl'), # Alternation - ('\$Python\\|Perl\\|Tcl\$', 'Perl'), # Grouped alternation - ('\$Python\$\\1', 'PythonPython'), # Backreference -# ('\$[0a-z][a-z]*,\$+', 'a5,b7,c9,'), # Disable the fastmap optimization - ('\$[a-z][a-z0-9]*,\$+', 'a5,b7,c9,') # A few sets -] - -# Test suite (for verifying correctness) -# -# The test suite is a list of 5- or 3-tuples. The 5 parts of a -# complete tuple are: -# element 0: a string containing the pattern -# 1: the string to match against the pattern -# 2: the expected result (SUCCEED, FAIL, SYNTAX_ERROR) -# 3: a string that will be eval()'ed to produce a test string. -# This is an arbitrary Python expression; the available -# variables are "found" (the whole match), and "g1", "g2", ... -# up to "g10" contain the contents of each group, or the -# string 'None' if the group wasn't given a value. -# 4: The expected result of evaluating the expression. -# If the two don't match, an error is reported. -# -# If the regex isn't expected to work, the latter two elements can be omitted. - -tests = [ -('abc', 'abc', SUCCEED, - 'found', 'abc'), -('abc', 'xbc', FAIL), -('abc', 'axc', FAIL), -('abc', 'abx', FAIL), -('abc', 'xabcy', SUCCEED, - 'found', 'abc'), -('abc', 'ababc', SUCCEED, - 'found', 'abc'), -('ab*c', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab*bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab+bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab+bc', 'abc', FAIL), -('ab+bc', 'abq', FAIL), -('ab+bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab?bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab?bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab?bc', 'abbbbc', FAIL), -('ab?c', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abcc', FAIL), -('^abc', 'abcc', SUCCEED, - 'found', 'abc'), -('^abc$', 'aabc', FAIL), -('abc$', 'aabc', SUCCEED, - 'found', 'abc'), -('^', 'abc', SUCCEED, - 'found+"-"', '-'), -('$', 'abc', SUCCEED, - 'found+"-"', '-'), -('a.c', 'abc', SUCCEED, - 'found', 'abc'), -('a.c', 'axc', SUCCEED, - 'found', 'axc'), -('a.*c', 'axyzc', SUCCEED, - 'found', 'axyzc'), -('a.*c', 'axyzd', FAIL), -('a[bc]d', 'abc', FAIL), -('a[bc]d', 'abd', SUCCEED, - 'found', 'abd'), -('a[b-d]e', 'abd', FAIL), -('a[b-d]e', 'ace', SUCCEED, - 'found', 'ace'), -('a[b-d]', 'aac', SUCCEED, - 'found', 'ac'), -('a[-b]', 'a-', SUCCEED, - 'found', 'a-'), -('a[b-]', 'a-', SUCCEED, - 'found', 'a-'), -('a[]b', '-', SYNTAX_ERROR), -('a[', '-', SYNTAX_ERROR), -('a\\', '-', SYNTAX_ERROR), -('abc\\)', '-', SYNTAX_ERROR), -('\$abc', '-', SYNTAX_ERROR), -('a]', 'a]', SUCCEED, - 'found', 'a]'), -('a[]]b', 'a]b', SUCCEED, - 'found', 'a]b'), -('a[^bc]d', 'aed', SUCCEED, - 'found', 'aed'), -('a[^bc]d', 'abd', FAIL), -('a[^-b]c', 'adc', SUCCEED, - 'found', 'adc'), -('a[^-b]c', 'a-c', FAIL), -('a[^]b]c', 'a]c', FAIL), -('a[^]b]c', 'adc', SUCCEED, - 'found', 'adc'), -('\\ba\\b', 'a-', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a-', SUCCEED, - '"-"', '-'), -('\\by\\b', 'xy', FAIL), -('\\by\\b', 'yz', FAIL), -('\\by\\b', 'xyz', FAIL), -('ab\\|cd', 'abc', SUCCEED, - 'found', 'ab'), -('ab\\|cd', 'abcd', SUCCEED, - 'found', 'ab'), -('\\(\$ef', 'def', SUCCEED, - 'found+"-"+g1', 'ef-'), -('$b', 'b', FAIL), -('a(b', 'a(b', SUCCEED, - 'found+"-"+g1', 'a(b-None'), -('a(*b', 'ab', SUCCEED, - 'found', 'ab'), -('a(*b', 'a((b', SUCCEED, - 'found', 'a((b'), -('a\\\\b', 'a\\b', SUCCEED, - 'found', 'a\\b'), -('\$\\(a\$\\)', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'a-a-a'), -('\$a\$b\$c\$', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abc-a-c'), -('a+b+c', 'aabbabc', SUCCEED, - 'found', 'abc'), -('\$a+\\|b\$*', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$+', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$?', 'ab', SUCCEED, - 'found+"-"+g1', 'a-a'), -('\\)\$', '-', SYNTAX_ERROR), -('[^ab]*', 'cde', SUCCEED, - 'found', 'cde'), -('abc', '', FAIL), -('a*', '', SUCCEED, - 'found', ''), -('a\\|b\\|c\\|d\\|e', 'e', SUCCEED, - 'found', 'e'), -('\\(a\\|b\\|c\\|d\\|e\$f', 'ef', SUCCEED, - 'found+"-"+g1', 'ef-e'), -('abcd*efg', 'abcdefg', SUCCEED, - 'found', 'abcdefg'), -('ab*', 'xabyabbbz', SUCCEED, - 'found', 'ab'), -('ab*', 'xayabbbz', SUCCEED, - 'found', 'a'), -('\$ab\\|cd\$e', 'abcde', SUCCEED, - 'found+"-"+g1', 'cde-cd'), -('[abhgefdc]ij', 'hij', SUCCEED, - 'found', 'hij'), -('^\$ab\\|cd\$e', 'abcde', FAIL, - 'xg1y', 'xy'), -('\$abc\\|\$ef', 'abcdef', SUCCEED, - 'found+"-"+g1', 'ef-'), -('\$a\\|b\$c*d', 'abcd', SUCCEED, - 'found+"-"+g1', 'bcd-b'), -('\$ab\\|ab*\$bc', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-a'), -('a\$[bc]*\$c*', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-bc'), -('a\$[bc]*\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]+\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]*\$\$c+d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-b-cd'), -('a[bcd]*dcdcde', 'adcdcde', SUCCEED, - 'found', 'adcdcde'), -('a[bcd]+dcdcde', 'adcdcde', FAIL), -('\$ab\\|a\$b*c', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-ab'), -('\$\\(a\$\$b\$c\\)\$d\$', 'abcd', SUCCEED, - 'g1+"-"+g2+"-"+g3+"-"+g4', 'abc-a-b-d'), -('[a-zA-Z_][a-zA-Z0-9_]*', 'alpha', SUCCEED, - 'found', 'alpha'), -('^a\$bc+\\|b[eh]\$g\\|.h$', 'abh', SUCCEED, - 'found+"-"+g1', 'bh-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'ij', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ij-ij-j'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effg', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'bcdd', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'reffgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$\\(\\(\\(\\(\\(\\(\\(\\(a\$\\)\\)\\)\\)\\)\\)\\)\\)', 'a', SUCCEED, - 'found', 'a'), -('multiple words of text', 'uh-uh', FAIL), -('multiple words', 'multiple words, yeah', SUCCEED, - 'found', 'multiple words'), -('\$.*\$c\$.*\$', 'abcde', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcde-ab-de'), -('(\$.*\$, \$.*\$)', '(a, b)', SUCCEED, - 'g2+"-"+g1', 'b-a'), -('[k]', 'ab', FAIL), -('a[-]?c', 'ac', SUCCEED, - 'found', 'ac'), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('\$[a-c]*\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('^\$.+\$?B', 'AB', SUCCEED, - 'g1', 'A'), -('\$a+\$.\\1$', 'aaaaa', SUCCEED, - 'found+"-"+g1', 'aaaaa-aa'), -('^\$a+\$.\\1$', 'aaaa', FAIL), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$[a-c]+\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$+\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a\$.+\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$a\$ba*\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$aa\\|a\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a\\|aa\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a+\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$[abc]*\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\$b\$c\\|ab', 'ab', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ab-None-None'), -('\$a\$+x', 'aaax', SUCCEED, - 'found+"-"+g1', 'aaax-a'), -('\$[ac]\$+x', 'aacx', SUCCEED, - 'found+"-"+g1', 'aacx-c'), -('\$[^/]*/\$*sub1/', 'd:msgs/tdir/sub1/trial/away.cpp', SUCCEED, - 'found+"-"+g1', 'd:msgs/tdir/sub1/-tdir/'), -('\$[^.]*\$\\.\$[^:]*\$:[T ]+\$.*\$', 'track1.title:TBlah blah blah', SUCCEED, - 'found+"-"+g1+"-"+g2+"-"+g3', 'track1.title:TBlah blah blah-track1-title-Blah blah blah'), -('\$[^N]*N\$+', 'abNNxyzN', SUCCEED, - 'found+"-"+g1', 'abNNxyzN-xyzN'), -('\$[^N]*N\$+', 'abNNxyz', SUCCEED, - 'found+"-"+g1', 'abNN-N'), -('\$[abc]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'abcx-abc'), -('\$[abc]*\$x', 'abc', FAIL), -('\$[xyz]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'x-'), -('\$a\$+b\\|aac', 'aac', SUCCEED, - 'found+"-"+g1', 'aac-None'), -('\<a', 'a', SUCCEED, 'found', 'a'), -('\<a', '!', FAIL), -('a\<b', 'ab', FAIL), -('a\>', 'ab', FAIL), -('a\>', 'a!', SUCCEED, 'found', 'a'), -('a\>', 'a', SUCCEED, 'found', 'a'), -] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): remove tests from really old regex module
by benjamin.peterson Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/4084b2c65dca changeset: 74673:4084b2c65dca branch: 3.2 parent: 74670:77188bc37c74 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jan 28 20:33:21 2012 -0500 summary: remove tests from really old regex module files: Lib/test/regex_tests.py | 285 ---------------------------- 1 files changed, 0 insertions(+), 285 deletions(-) diff --git a/Lib/test/regex_tests.py b/Lib/test/regex_tests.py deleted file mode 100644 --- a/Lib/test/regex_tests.py +++ /dev/null @@ -1,285 +0,0 @@ -# Regex test suite and benchmark suite v1.5a2 - -# The 3 possible outcomes for each pattern -[SUCCEED, FAIL, SYNTAX_ERROR] = range(3) - -# Benchmark suite (needs expansion) -# -# The benchmark suite does not test correctness, just speed. The -# first element of each tuple is the regex pattern; the second is a -# string to match it against. The benchmarking code will embed the -# second string inside several sizes of padding, to test how regex -# matching performs on large strings. - -benchmarks = [ - ('Python', 'Python'), # Simple text literal - ('.*Python', 'Python'), # Bad text literal - ('.*Python.*', 'Python'), # Worse text literal - ('.*\$Python\$', 'Python'), # Bad text literal with grouping - - ('(Python\\|Perl\\|Tcl', 'Perl'), # Alternation - ('\$Python\\|Perl\\|Tcl\$', 'Perl'), # Grouped alternation - ('\$Python\$\\1', 'PythonPython'), # Backreference -# ('\$[0a-z][a-z]*,\$+', 'a5,b7,c9,'), # Disable the fastmap optimization - ('\$[a-z][a-z0-9]*,\$+', 'a5,b7,c9,') # A few sets -] - -# Test suite (for verifying correctness) -# -# The test suite is a list of 5- or 3-tuples. The 5 parts of a -# complete tuple are: -# element 0: a string containing the pattern -# 1: the string to match against the pattern -# 2: the expected result (SUCCEED, FAIL, SYNTAX_ERROR) -# 3: a string that will be eval()'ed to produce a test string. -# This is an arbitrary Python expression; the available -# variables are "found" (the whole match), and "g1", "g2", ... -# up to "g10" contain the contents of each group, or the -# string 'None' if the group wasn't given a value. -# 4: The expected result of evaluating the expression. -# If the two don't match, an error is reported. -# -# If the regex isn't expected to work, the latter two elements can be omitted. - -tests = [ -('abc', 'abc', SUCCEED, - 'found', 'abc'), -('abc', 'xbc', FAIL), -('abc', 'axc', FAIL), -('abc', 'abx', FAIL), -('abc', 'xabcy', SUCCEED, - 'found', 'abc'), -('abc', 'ababc', SUCCEED, - 'found', 'abc'), -('ab*c', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab*bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab*bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab+bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab+bc', 'abc', FAIL), -('ab+bc', 'abq', FAIL), -('ab+bc', 'abbbbc', SUCCEED, - 'found', 'abbbbc'), -('ab?bc', 'abbc', SUCCEED, - 'found', 'abbc'), -('ab?bc', 'abc', SUCCEED, - 'found', 'abc'), -('ab?bc', 'abbbbc', FAIL), -('ab?c', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abc', SUCCEED, - 'found', 'abc'), -('^abc$', 'abcc', FAIL), -('^abc', 'abcc', SUCCEED, - 'found', 'abc'), -('^abc$', 'aabc', FAIL), -('abc$', 'aabc', SUCCEED, - 'found', 'abc'), -('^', 'abc', SUCCEED, - 'found+"-"', '-'), -('$', 'abc', SUCCEED, - 'found+"-"', '-'), -('a.c', 'abc', SUCCEED, - 'found', 'abc'), -('a.c', 'axc', SUCCEED, - 'found', 'axc'), -('a.*c', 'axyzc', SUCCEED, - 'found', 'axyzc'), -('a.*c', 'axyzd', FAIL), -('a[bc]d', 'abc', FAIL), -('a[bc]d', 'abd', SUCCEED, - 'found', 'abd'), -('a[b-d]e', 'abd', FAIL), -('a[b-d]e', 'ace', SUCCEED, - 'found', 'ace'), -('a[b-d]', 'aac', SUCCEED, - 'found', 'ac'), -('a[-b]', 'a-', SUCCEED, - 'found', 'a-'), -('a[b-]', 'a-', SUCCEED, - 'found', 'a-'), -('a[]b', '-', SYNTAX_ERROR), -('a[', '-', SYNTAX_ERROR), -('a\\', '-', SYNTAX_ERROR), -('abc\\)', '-', SYNTAX_ERROR), -('\$abc', '-', SYNTAX_ERROR), -('a]', 'a]', SUCCEED, - 'found', 'a]'), -('a[]]b', 'a]b', SUCCEED, - 'found', 'a]b'), -('a[^bc]d', 'aed', SUCCEED, - 'found', 'aed'), -('a[^bc]d', 'abd', FAIL), -('a[^-b]c', 'adc', SUCCEED, - 'found', 'adc'), -('a[^-b]c', 'a-c', FAIL), -('a[^]b]c', 'a]c', FAIL), -('a[^]b]c', 'adc', SUCCEED, - 'found', 'adc'), -('\\ba\\b', 'a-', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a', SUCCEED, - '"-"', '-'), -('\\ba\\b', '-a-', SUCCEED, - '"-"', '-'), -('\\by\\b', 'xy', FAIL), -('\\by\\b', 'yz', FAIL), -('\\by\\b', 'xyz', FAIL), -('ab\\|cd', 'abc', SUCCEED, - 'found', 'ab'), -('ab\\|cd', 'abcd', SUCCEED, - 'found', 'ab'), -('\\(\$ef', 'def', SUCCEED, - 'found+"-"+g1', 'ef-'), -('$b', 'b', FAIL), -('a(b', 'a(b', SUCCEED, - 'found+"-"+g1', 'a(b-None'), -('a(*b', 'ab', SUCCEED, - 'found', 'ab'), -('a(*b', 'a((b', SUCCEED, - 'found', 'a((b'), -('a\\\\b', 'a\\b', SUCCEED, - 'found', 'a\\b'), -('\$\\(a\$\\)', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'a-a-a'), -('\$a\$b\$c\$', 'abc', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abc-a-c'), -('a+b+c', 'aabbabc', SUCCEED, - 'found', 'abc'), -('\$a+\\|b\$*', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$+', 'ab', SUCCEED, - 'found+"-"+g1', 'ab-b'), -('\$a+\\|b\$?', 'ab', SUCCEED, - 'found+"-"+g1', 'a-a'), -('\\)\$', '-', SYNTAX_ERROR), -('[^ab]*', 'cde', SUCCEED, - 'found', 'cde'), -('abc', '', FAIL), -('a*', '', SUCCEED, - 'found', ''), -('a\\|b\\|c\\|d\\|e', 'e', SUCCEED, - 'found', 'e'), -('\\(a\\|b\\|c\\|d\\|e\$f', 'ef', SUCCEED, - 'found+"-"+g1', 'ef-e'), -('abcd*efg', 'abcdefg', SUCCEED, - 'found', 'abcdefg'), -('ab*', 'xabyabbbz', SUCCEED, - 'found', 'ab'), -('ab*', 'xayabbbz', SUCCEED, - 'found', 'a'), -('\$ab\\|cd\$e', 'abcde', SUCCEED, - 'found+"-"+g1', 'cde-cd'), -('[abhgefdc]ij', 'hij', SUCCEED, - 'found', 'hij'), -('^\$ab\\|cd\$e', 'abcde', FAIL, - 'xg1y', 'xy'), -('\$abc\\|\$ef', 'abcdef', SUCCEED, - 'found+"-"+g1', 'ef-'), -('\$a\\|b\$c*d', 'abcd', SUCCEED, - 'found+"-"+g1', 'bcd-b'), -('\$ab\\|ab*\$bc', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-a'), -('a\$[bc]*\$c*', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-bc'), -('a\$[bc]*\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]+\$\$c*d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-bc-d'), -('a\$[bc]*\$\$c+d\$', 'abcd', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcd-b-cd'), -('a[bcd]*dcdcde', 'adcdcde', SUCCEED, - 'found', 'adcdcde'), -('a[bcd]+dcdcde', 'adcdcde', FAIL), -('\$ab\\|a\$b*c', 'abc', SUCCEED, - 'found+"-"+g1', 'abc-ab'), -('\$\\(a\$\$b\$c\\)\$d\$', 'abcd', SUCCEED, - 'g1+"-"+g2+"-"+g3+"-"+g4', 'abc-a-b-d'), -('[a-zA-Z_][a-zA-Z0-9_]*', 'alpha', SUCCEED, - 'found', 'alpha'), -('^a\$bc+\\|b[eh]\$g\\|.h$', 'abh', SUCCEED, - 'found+"-"+g1', 'bh-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'ij', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ij-ij-j'), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'effg', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'bcdd', FAIL), -('\$bc+d$\\|ef*g.\\|h?i\\(j\\|k\$\\)', 'reffgz', SUCCEED, - 'found+"-"+g1+"-"+g2', 'effgz-effgz-None'), -('\$\\(\\(\\(\\(\\(\\(\\(\\(a\$\\)\\)\\)\\)\\)\\)\\)\\)', 'a', SUCCEED, - 'found', 'a'), -('multiple words of text', 'uh-uh', FAIL), -('multiple words', 'multiple words, yeah', SUCCEED, - 'found', 'multiple words'), -('\$.*\$c\$.*\$', 'abcde', SUCCEED, - 'found+"-"+g1+"-"+g2', 'abcde-ab-de'), -('(\$.*\$, \$.*\$)', '(a, b)', SUCCEED, - 'g2+"-"+g1', 'b-a'), -('[k]', 'ab', FAIL), -('a[-]?c', 'ac', SUCCEED, - 'found', 'ac'), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('\$[a-c]*\$\\1', 'abcabc', SUCCEED, - 'g1', 'abc'), -('^\$.+\$?B', 'AB', SUCCEED, - 'g1', 'A'), -('\$a+\$.\\1$', 'aaaaa', SUCCEED, - 'found+"-"+g1', 'aaaaa-aa'), -('^\$a+\$.\\1$', 'aaaa', FAIL), -('\$abc\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$[a-c]+\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a+\$+\\1', 'aa', SUCCEED, - 'found+"-"+g1', 'aa-a'), -('\$a\$.+\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$a\$ba*\\1', 'aba', SUCCEED, - 'found+"-"+g1', 'aba-a'), -('\$aa\\|a\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a\\|aa\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$a+\$a\\1$', 'aaa', SUCCEED, - 'found+"-"+g1', 'aaa-a'), -('\$[abc]*\$\\1', 'abcabc', SUCCEED, - 'found+"-"+g1', 'abcabc-abc'), -('\$a\$\$b\$c\\|ab', 'ab', SUCCEED, - 'found+"-"+g1+"-"+g2', 'ab-None-None'), -('\$a\$+x', 'aaax', SUCCEED, - 'found+"-"+g1', 'aaax-a'), -('\$[ac]\$+x', 'aacx', SUCCEED, - 'found+"-"+g1', 'aacx-c'), -('\$[^/]*/\$*sub1/', 'd:msgs/tdir/sub1/trial/away.cpp', SUCCEED, - 'found+"-"+g1', 'd:msgs/tdir/sub1/-tdir/'), -('\$[^.]*\$\\.\$[^:]*\$:[T ]+\$.*\$', 'track1.title:TBlah blah blah', SUCCEED, - 'found+"-"+g1+"-"+g2+"-"+g3', 'track1.title:TBlah blah blah-track1-title-Blah blah blah'), -('\$[^N]*N\$+', 'abNNxyzN', SUCCEED, - 'found+"-"+g1', 'abNNxyzN-xyzN'), -('\$[^N]*N\$+', 'abNNxyz', SUCCEED, - 'found+"-"+g1', 'abNN-N'), -('\$[abc]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'abcx-abc'), -('\$[abc]*\$x', 'abc', FAIL), -('\$[xyz]*\$x', 'abcx', SUCCEED, - 'found+"-"+g1', 'x-'), -('\$a\$+b\\|aac', 'aac', SUCCEED, - 'found+"-"+g1', 'aac-None'), -('\<a', 'a', SUCCEED, 'found', 'a'), -('\<a', '!', FAIL), -('a\<b', 'ab', FAIL), -('a\>', 'ab', FAIL), -('a\>', 'a!', SUCCEED, 'found', 'a'), -('a\>', 'a', SUCCEED, 'found', 'a'), -] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #13806: The size check in audioop decompression functions was too strict
by antoine.pitrou Jan. 28, 2012

Jan. 28, 2012

http://hg.python.org/cpython/rev/f1ee3bb6ba64 changeset: 74672:f1ee3bb6ba64 branch: 2.7 parent: 74664:eaf553b063a7 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Jan 28 22:01:59 2012 +0100 summary: Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. files: Lib/test/test_audioop.py | 25 +++++++++++++++++++------ Misc/NEWS | 3 +++ Modules/audioop.c | 6 +++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -21,9 +21,9 @@ data = [gendata1(), gendata2(), gendata4()] INVALID_DATA = [ - ('abc', 0), - ('abc', 2), - ('abc', 4), + (b'abc', 0), + (b'abc', 2), + (b'abc', 4), ] @@ -94,7 +94,9 @@ def test_adpcm2lin(self): # Very cursory test - self.assertEqual(audioop.adpcm2lin('\0\0', 1, None), ('\0\0\0\0', (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 1, None), (b'\0' * 4, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 2, None), (b'\0' * 8, (0,0))) + self.assertEqual(audioop.adpcm2lin(b'\0\0', 4, None), (b'\0' * 16, (0,0))) def test_lin2adpcm(self): # Very cursory test @@ -109,6 +111,9 @@ # Cursory d = audioop.lin2alaw(data[0], 1) self.assertEqual(audioop.alaw2lin(d, 1), data[0]) + self.assertEqual(audioop.alaw2lin(d, 2), b'\x08\x00\x08\x01\x10\x02') + self.assertEqual(audioop.alaw2lin(d, 4), + b'\x00\x00\x08\x00\x00\x00\x08\x01\x00\x00\x10\x02') def test_lin2ulaw(self): self.assertEqual(audioop.lin2ulaw(data[0], 1), '\xff\xe7\xdb') @@ -119,6 +124,9 @@ # Cursory d = audioop.lin2ulaw(data[0], 1) self.assertEqual(audioop.ulaw2lin(d, 1), data[0]) + self.assertEqual(audioop.ulaw2lin(d, 2), b'\x00\x00\x04\x01\x0c\x02') + self.assertEqual(audioop.ulaw2lin(d, 4), + b'\x00\x00\x00\x00\x00\x00\x04\x01\x00\x00\x0c\x02') def test_mul(self): data2 = [] @@ -193,10 +201,15 @@ self.assertRaises(audioop.error, audioop.lin2lin, data, size, size2) self.assertRaises(audioop.error, audioop.ratecv, data, size, 1, 1, 1, state) self.assertRaises(audioop.error, audioop.lin2ulaw, data, size) + self.assertRaises(audioop.error, audioop.lin2alaw, data, size) + self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) + + def test_wrongsize(self): + data = b'abc' + state = None + for size in (-1, 3, 5): self.assertRaises(audioop.error, audioop.ulaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2alaw, data, size) self.assertRaises(audioop.error, audioop.alaw2lin, data, size) - self.assertRaises(audioop.error, audioop.lin2adpcm, data, size, state) self.assertRaises(audioop.error, audioop.adpcm2lin, data, size, state) def test_main(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -90,6 +90,9 @@ Library ------- +- Issue #13806: The size check in audioop decompression functions was too + strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. + - Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC IV attack countermeasure. diff --git a/Modules/audioop.c b/Modules/audioop.c --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -1298,7 +1298,7 @@ &cp, &len, &size) ) return 0; - if (!audioop_check_parameters(len, size)) + if (!audioop_check_size(size)) return NULL; if (len > INT_MAX/size) { @@ -1367,7 +1367,7 @@ &cp, &len, &size) ) return 0; - if (!audioop_check_parameters(len, size)) + if (!audioop_check_size(size)) return NULL; if (len > INT_MAX/size) { @@ -1509,7 +1509,7 @@ &cp, &len, &size, &state) ) return 0; - if (!audioop_check_parameters(len, size)) + if (!audioop_check_size(size)) return NULL; /* Decode state, should have (value, step) */ -- Repository URL: http://hg.python.org/cpython

1 0