2017-03-27 11:05:26 -03:00
|
|
|
|
from test.support import (gc_collect, bigmemtest, _2G,
|
2021-05-27 03:43:52 -03:00
|
|
|
|
cpython_only, captured_stdout,
|
2022-08-03 20:19:36 -03:00
|
|
|
|
check_disallow_instantiation, is_emscripten, is_wasi,
|
2023-06-11 06:17:35 -03:00
|
|
|
|
warnings_helper, SHORT_TIMEOUT)
|
2014-10-30 19:53:49 -03:00
|
|
|
|
import locale
|
1997-07-11 16:34:44 -03:00
|
|
|
|
import re
|
2011-03-25 09:08:44 -03:00
|
|
|
|
import string
|
2022-04-02 05:35:13 -03:00
|
|
|
|
import sys
|
2022-03-22 12:27:55 -03:00
|
|
|
|
import time
|
2013-10-25 16:36:10 -03:00
|
|
|
|
import unittest
|
2016-11-21 11:35:08 -04:00
|
|
|
|
import warnings
|
|
|
|
|
from re import Scanner
|
2004-05-31 00:09:25 -03:00
|
|
|
|
from weakref import proxy
|
1997-07-11 16:34:44 -03:00
|
|
|
|
|
2022-08-03 20:19:36 -03:00
|
|
|
|
# some platforms lack working multiprocessing
|
|
|
|
|
try:
|
|
|
|
|
import _multiprocessing
|
|
|
|
|
except ImportError:
|
|
|
|
|
multiprocessing = None
|
|
|
|
|
else:
|
|
|
|
|
import multiprocessing
|
|
|
|
|
|
1997-07-17 19:36:14 -03:00
|
|
|
|
# Misc tests from Tim Peters' re.doc
|
|
|
|
|
|
2003-07-02 11:36:59 -03:00
|
|
|
|
# WARNING: Don't change details in these tests if you don't know
|
2011-03-15 00:18:48 -03:00
|
|
|
|
# what you're doing. Some of these tests were carefully modeled to
|
2003-06-19 21:25:14 -03:00
|
|
|
|
# cover most of the code.
|
|
|
|
|
|
2013-10-16 06:46:28 -03:00
|
|
|
|
class S(str):
|
|
|
|
|
def __getitem__(self, index):
|
|
|
|
|
return S(super().__getitem__(index))
|
|
|
|
|
|
|
|
|
|
class B(bytes):
|
|
|
|
|
def __getitem__(self, index):
|
|
|
|
|
return B(super().__getitem__(index))
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
class ReTests(unittest.TestCase):
|
2004-05-31 00:09:25 -03:00
|
|
|
|
|
2013-10-16 06:46:28 -03:00
|
|
|
|
def assertTypedEqual(self, actual, expect, msg=None):
|
|
|
|
|
self.assertEqual(actual, expect, msg)
|
|
|
|
|
def recurse(actual, expect):
|
|
|
|
|
if isinstance(expect, (tuple, list)):
|
|
|
|
|
for x, y in zip(actual, expect):
|
|
|
|
|
recurse(x, y)
|
|
|
|
|
else:
|
|
|
|
|
self.assertIs(type(actual), type(expect), msg)
|
|
|
|
|
recurse(actual, expect)
|
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
def checkPatternError(self, pattern, errmsg, pos=None):
|
|
|
|
|
with self.assertRaises(re.error) as cm:
|
|
|
|
|
re.compile(pattern)
|
|
|
|
|
with self.subTest(pattern=pattern):
|
|
|
|
|
err = cm.exception
|
|
|
|
|
self.assertEqual(err.msg, errmsg)
|
|
|
|
|
if pos is not None:
|
|
|
|
|
self.assertEqual(err.pos, pos)
|
|
|
|
|
|
|
|
|
|
def checkTemplateError(self, pattern, repl, string, errmsg, pos=None):
|
|
|
|
|
with self.assertRaises(re.error) as cm:
|
|
|
|
|
re.sub(pattern, repl, string)
|
|
|
|
|
with self.subTest(pattern=pattern, repl=repl):
|
|
|
|
|
err = cm.exception
|
|
|
|
|
self.assertEqual(err.msg, errmsg)
|
|
|
|
|
if pos is not None:
|
|
|
|
|
self.assertEqual(err.pos, pos)
|
|
|
|
|
|
2012-03-07 16:50:25 -04:00
|
|
|
|
def test_keep_buffer(self):
|
|
|
|
|
# See bug 14212
|
|
|
|
|
b = bytearray(b'x')
|
|
|
|
|
it = re.finditer(b'a', b)
|
|
|
|
|
with self.assertRaises(BufferError):
|
|
|
|
|
b.extend(b'x'*400)
|
|
|
|
|
list(it)
|
|
|
|
|
del it
|
|
|
|
|
gc_collect()
|
|
|
|
|
b.extend(b'x'*400)
|
|
|
|
|
|
2004-05-31 00:09:25 -03:00
|
|
|
|
def test_weakref(self):
|
|
|
|
|
s = 'QabbbcR'
|
|
|
|
|
x = re.compile('ab+c')
|
|
|
|
|
y = proxy(x)
|
|
|
|
|
self.assertEqual(x.findall('QabbbcR'), y.findall('QabbbcR'))
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_search_star_plus(self):
|
|
|
|
|
self.assertEqual(re.search('x*', 'axx').span(0), (0, 0))
|
|
|
|
|
self.assertEqual(re.search('x*', 'axx').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.search('x+', 'axx').span(0), (1, 3))
|
|
|
|
|
self.assertEqual(re.search('x+', 'axx').span(), (1, 3))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.search('x', 'aaa'))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
self.assertEqual(re.match('a*', 'xxx').span(0), (0, 0))
|
|
|
|
|
self.assertEqual(re.match('a*', 'xxx').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match('x*', 'xxxa').span(0), (0, 3))
|
|
|
|
|
self.assertEqual(re.match('x*', 'xxxa').span(), (0, 3))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.match('a+', 'xxx'))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2022-03-21 13:28:22 -03:00
|
|
|
|
def test_branching(self):
|
|
|
|
|
"""Test Branching
|
|
|
|
|
Test expressions using the OR ('|') operator."""
|
|
|
|
|
self.assertEqual(re.match('(ab|ba)', 'ab').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(ab|ba)', 'ba').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(abc|bac|ca|cb)', 'abc').span(),
|
|
|
|
|
(0, 3))
|
|
|
|
|
self.assertEqual(re.match('(abc|bac|ca|cb)', 'bac').span(),
|
|
|
|
|
(0, 3))
|
|
|
|
|
self.assertEqual(re.match('(abc|bac|ca|cb)', 'ca').span(),
|
|
|
|
|
(0, 2))
|
|
|
|
|
self.assertEqual(re.match('(abc|bac|ca|cb)', 'cb').span(),
|
|
|
|
|
(0, 2))
|
|
|
|
|
self.assertEqual(re.match('((a)|(b)|(c))', 'a').span(), (0, 1))
|
|
|
|
|
self.assertEqual(re.match('((a)|(b)|(c))', 'b').span(), (0, 1))
|
|
|
|
|
self.assertEqual(re.match('((a)|(b)|(c))', 'c').span(), (0, 1))
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def bump_num(self, matchobj):
|
1998-03-26 15:42:58 -04:00
|
|
|
|
int_value = int(matchobj.group(0))
|
|
|
|
|
return str(int_value + 1)
|
1997-07-17 19:36:14 -03:00
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_basic_re_sub(self):
|
2013-10-16 06:46:28 -03:00
|
|
|
|
self.assertTypedEqual(re.sub('y', 'a', 'xyz'), 'xaz')
|
|
|
|
|
self.assertTypedEqual(re.sub('y', S('a'), S('xyz')), 'xaz')
|
|
|
|
|
self.assertTypedEqual(re.sub(b'y', b'a', b'xyz'), b'xaz')
|
|
|
|
|
self.assertTypedEqual(re.sub(b'y', B(b'a'), B(b'xyz')), b'xaz')
|
|
|
|
|
self.assertTypedEqual(re.sub(b'y', bytearray(b'a'), bytearray(b'xyz')), b'xaz')
|
|
|
|
|
self.assertTypedEqual(re.sub(b'y', memoryview(b'a'), memoryview(b'xyz')), b'xaz')
|
2013-10-26 04:45:48 -03:00
|
|
|
|
for y in ("\xe0", "\u0430", "\U0001d49c"):
|
|
|
|
|
self.assertEqual(re.sub(y, 'a', 'x%sz' % y), 'xaz')
|
2013-10-16 06:46:28 -03:00
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
self.assertEqual(re.sub("(?i)b+", "x", "bbbb BBBB"), 'x x')
|
|
|
|
|
self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y'),
|
|
|
|
|
'9.3 -3 24x100y')
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y', 3),
|
|
|
|
|
'9.3 -3 23x99y')
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
2014-10-29 12:58:59 -03:00
|
|
|
|
self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y', count=3),
|
2003-04-24 16:43:18 -03:00
|
|
|
|
'9.3 -3 23x99y')
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.sub('.', lambda m: r"\n", 'x'), '\\n')
|
|
|
|
|
self.assertEqual(re.sub('.', r"\n", 'x'), '\n')
|
|
|
|
|
|
|
|
|
|
s = r"\1\1"
|
|
|
|
|
self.assertEqual(re.sub('(.)', s, 'x'), 'xx')
|
2017-12-12 13:21:50 -04:00
|
|
|
|
self.assertEqual(re.sub('(.)', s.replace('\\', r'\\'), 'x'), s)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
self.assertEqual(re.sub('(.)', lambda m: s, 'x'), s)
|
|
|
|
|
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.sub('(?P<a>x)', r'\g<a>\g<a>', 'xx'), 'xxxx')
|
|
|
|
|
self.assertEqual(re.sub('(?P<a>x)', r'\g<a>\g<1>', 'xx'), 'xxxx')
|
|
|
|
|
self.assertEqual(re.sub('(?P<unk>x)', r'\g<unk>\g<unk>', 'xx'), 'xxxx')
|
|
|
|
|
self.assertEqual(re.sub('(?P<unk>x)', r'\g<1>\g<1>', 'xx'), 'xxxx')
|
2022-04-30 07:13:46 -03:00
|
|
|
|
self.assertEqual(re.sub('()x', r'\g<0>\g<0>', 'xx'), 'xxxx')
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2015-03-24 17:58:14 -03:00
|
|
|
|
self.assertEqual(re.sub('a', r'\t\n\v\r\f\a\b', 'a'), '\t\n\v\r\f\a\b')
|
|
|
|
|
self.assertEqual(re.sub('a', '\t\n\v\r\f\a\b', 'a'), '\t\n\v\r\f\a\b')
|
|
|
|
|
self.assertEqual(re.sub('a', '\t\n\v\r\f\a\b', 'a'),
|
|
|
|
|
(chr(9)+chr(10)+chr(11)+chr(13)+chr(12)+chr(7)+chr(8)))
|
|
|
|
|
for c in 'cdehijklmopqsuwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
|
|
|
|
|
with self.subTest(c):
|
2016-06-11 13:15:00 -03:00
|
|
|
|
with self.assertRaises(re.error):
|
2015-03-24 17:58:14 -03:00
|
|
|
|
self.assertEqual(re.sub('a', '\\' + c, 'a'), '\\' + c)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.sub(r'^\s*', 'X', 'test'), 'Xtest')
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2003-04-25 11:31:54 -03:00
|
|
|
|
def test_bug_449964(self):
|
|
|
|
|
# fails for group followed by other escape
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.sub(r'(?P<unk>x)', r'\g<1>\g<1>\b', 'xx'),
|
2003-04-25 11:31:54 -03:00
|
|
|
|
'xx\bxx\b')
|
|
|
|
|
|
|
|
|
|
def test_bug_449000(self):
|
|
|
|
|
# Test for sub() on escaped characters
|
2003-04-24 16:43:18 -03:00
|
|
|
|
self.assertEqual(re.sub(r'\r\n', r'\n', 'abc\r\ndef\r\n'),
|
|
|
|
|
'abc\ndef\n')
|
|
|
|
|
self.assertEqual(re.sub('\r\n', r'\n', 'abc\r\ndef\r\n'),
|
|
|
|
|
'abc\ndef\n')
|
|
|
|
|
self.assertEqual(re.sub(r'\r\n', '\n', 'abc\r\ndef\r\n'),
|
|
|
|
|
'abc\ndef\n')
|
|
|
|
|
self.assertEqual(re.sub('\r\n', '\n', 'abc\r\ndef\r\n'),
|
|
|
|
|
'abc\ndef\n')
|
|
|
|
|
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
|
def test_bug_1661(self):
|
|
|
|
|
# Verify that flags do not get silently ignored with compiled patterns
|
|
|
|
|
pattern = re.compile('.')
|
|
|
|
|
self.assertRaises(ValueError, re.match, pattern, 'A', re.I)
|
|
|
|
|
self.assertRaises(ValueError, re.search, pattern, 'A', re.I)
|
|
|
|
|
self.assertRaises(ValueError, re.findall, pattern, 'A', re.I)
|
|
|
|
|
self.assertRaises(ValueError, re.compile, pattern, re.I)
|
|
|
|
|
|
2008-09-10 11:30:50 -03:00
|
|
|
|
def test_bug_3629(self):
|
|
|
|
|
# A regex that triggered a bug in the sre-code validator
|
|
|
|
|
re.compile("(?P<quote>)(?(quote))")
|
|
|
|
|
|
2004-09-03 14:06:10 -03:00
|
|
|
|
def test_sub_template_numeric_escape(self):
|
|
|
|
|
# bug 776311 and friends
|
|
|
|
|
self.assertEqual(re.sub('x', r'\0', 'x'), '\0')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\000', 'x'), '\000')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\001', 'x'), '\001')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\008', 'x'), '\0' + '8')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\009', 'x'), '\0' + '9')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\111', 'x'), '\111')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\117', 'x'), '\117')
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.assertEqual(re.sub('x', r'\377', 'x'), '\377')
|
2004-09-03 14:06:10 -03:00
|
|
|
|
|
|
|
|
|
self.assertEqual(re.sub('x', r'\1111', 'x'), '\1111')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\1111', 'x'), '\111' + '1')
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.sub('x', r'\00', 'x'), '\x00')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\07', 'x'), '\x07')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\08', 'x'), '\0' + '8')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\09', 'x'), '\0' + '9')
|
|
|
|
|
self.assertEqual(re.sub('x', r'\0a', 'x'), '\0' + 'a')
|
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkTemplateError('x', r'\400', 'x',
|
|
|
|
|
r'octal escape value \400 outside of '
|
|
|
|
|
r'range 0-0o377', 0)
|
|
|
|
|
self.checkTemplateError('x', r'\777', 'x',
|
|
|
|
|
r'octal escape value \777 outside of '
|
|
|
|
|
r'range 0-0o377', 0)
|
|
|
|
|
|
2016-10-23 06:11:19 -03:00
|
|
|
|
self.checkTemplateError('x', r'\1', 'x', 'invalid group reference 1', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\8', 'x', 'invalid group reference 8', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\9', 'x', 'invalid group reference 9', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\11', 'x', 'invalid group reference 11', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\18', 'x', 'invalid group reference 18', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\1a', 'x', 'invalid group reference 1', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\90', 'x', 'invalid group reference 90', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\99', 'x', 'invalid group reference 99', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\118', 'x', 'invalid group reference 11', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\11a', 'x', 'invalid group reference 11', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\181', 'x', 'invalid group reference 18', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\800', 'x', 'invalid group reference 80', 1)
|
|
|
|
|
self.checkTemplateError('x', r'\8', '', 'invalid group reference 8', 1)
|
2004-09-03 14:06:10 -03:00
|
|
|
|
|
|
|
|
|
# in python2.3 (etc), these loop endlessly in sre_parser.py
|
|
|
|
|
self.assertEqual(re.sub('(((((((((((x)))))))))))', r'\11', 'x'), 'x')
|
|
|
|
|
self.assertEqual(re.sub('((((((((((y))))))))))(.)', r'\118', 'xyz'),
|
|
|
|
|
'xz8')
|
|
|
|
|
self.assertEqual(re.sub('((((((((((y))))))))))(.)', r'\11a', 'xyz'),
|
|
|
|
|
'xza')
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_qualified_re_sub(self):
|
|
|
|
|
self.assertEqual(re.sub('a', 'b', 'aaaaa'), 'bbbbb')
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
self.assertEqual(re.sub('a', 'b', 'aaaaa', 1), 'baaaa')
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
2014-10-29 12:58:59 -03:00
|
|
|
|
self.assertEqual(re.sub('a', 'b', 'aaaaa', count=1), 'baaaa')
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"sub\(\) got multiple values for argument 'count'"):
|
|
|
|
|
re.sub('a', 'b', 'aaaaa', 1, count=1)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"sub\(\) got multiple values for argument 'flags'"):
|
|
|
|
|
re.sub('a', 'b', 'aaaaa', 1, 0, flags=0)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"sub\(\) takes from 3 to 5 positional arguments but 6 "
|
|
|
|
|
r"were given"):
|
|
|
|
|
re.sub('a', 'b', 'aaaaa', 1, 0, 0)
|
|
|
|
|
|
|
|
|
|
def test_misuse_flags(self):
|
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
result = re.sub('a', 'b', 'aaaaa', re.I)
|
|
|
|
|
self.assertEqual(result, re.sub('a', 'b', 'aaaaa', count=int(re.I)))
|
|
|
|
|
self.assertEqual(str(w.warning),
|
|
|
|
|
"'count' is passed as positional argument")
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
result = re.subn("b*", "x", "xyz", re.I)
|
|
|
|
|
self.assertEqual(result, re.subn("b*", "x", "xyz", count=int(re.I)))
|
|
|
|
|
self.assertEqual(str(w.warning),
|
|
|
|
|
"'count' is passed as positional argument")
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
result = re.split(":", ":a:b::c", re.I)
|
|
|
|
|
self.assertEqual(result, re.split(":", ":a:b::c", maxsplit=int(re.I)))
|
|
|
|
|
self.assertEqual(str(w.warning),
|
|
|
|
|
"'maxsplit' is passed as positional argument")
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
|
|
|
|
|
2003-04-25 11:31:54 -03:00
|
|
|
|
def test_bug_114660(self):
|
|
|
|
|
self.assertEqual(re.sub(r'(\S)\s+(\S)', r'\1 \2', 'hello there'),
|
|
|
|
|
'hello there')
|
|
|
|
|
|
2012-11-03 15:33:08 -03:00
|
|
|
|
def test_symbolic_groups(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
re.compile(r'(?P<a>x)(?P=a)(?(a)y)')
|
|
|
|
|
re.compile(r'(?P<a1>x)(?P=a1)(?(a1)y)')
|
|
|
|
|
re.compile(r'(?P<a1>x)\1(?(1)y)')
|
2022-04-19 10:56:51 -03:00
|
|
|
|
re.compile(b'(?P<a1>x)(?P=a1)(?(a1)y)')
|
|
|
|
|
# New valid identifiers in Python 3
|
|
|
|
|
re.compile('(?P<µ>x)(?P=µ)(?(µ)y)')
|
|
|
|
|
re.compile('(?P<𝔘𝔫𝔦𝔠𝔬𝔡𝔢>x)(?P=𝔘𝔫𝔦𝔠𝔬𝔡𝔢)(?(𝔘𝔫𝔦𝔠𝔬𝔡𝔢)y)')
|
|
|
|
|
# Support > 100 groups.
|
|
|
|
|
pat = '|'.join('x(?P<a%d>%x)y' % (i, i) for i in range(1, 200 + 1))
|
|
|
|
|
pat = '(?:%s)(?(200)z|t)' % pat
|
|
|
|
|
self.assertEqual(re.match(pat, 'xc8yz').span(), (0, 5))
|
|
|
|
|
|
|
|
|
|
def test_symbolic_groups_errors(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkPatternError(r'(?P<a>)(?P<a>)',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
"redefinition of group name 'a' as group 2; "
|
|
|
|
|
"was group 1")
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkPatternError(r'(?P<a>(?P=a))',
|
2015-07-18 17:27:00 -03:00
|
|
|
|
"cannot refer to an open group", 10)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkPatternError(r'(?Pxy)', 'unknown extension ?Px')
|
|
|
|
|
self.checkPatternError(r'(?P<a>)(?P=a', 'missing ), unterminated name', 11)
|
|
|
|
|
self.checkPatternError(r'(?P=', 'missing group name', 4)
|
|
|
|
|
self.checkPatternError(r'(?P=)', 'missing group name', 4)
|
|
|
|
|
self.checkPatternError(r'(?P=1)', "bad character in group name '1'", 4)
|
|
|
|
|
self.checkPatternError(r'(?P=a)', "unknown group name 'a'")
|
|
|
|
|
self.checkPatternError(r'(?P=a1)', "unknown group name 'a1'")
|
|
|
|
|
self.checkPatternError(r'(?P=a.)', "bad character in group name 'a.'", 4)
|
|
|
|
|
self.checkPatternError(r'(?P<)', 'missing >, unterminated name', 4)
|
|
|
|
|
self.checkPatternError(r'(?P<a', 'missing >, unterminated name', 4)
|
|
|
|
|
self.checkPatternError(r'(?P<', 'missing group name', 4)
|
|
|
|
|
self.checkPatternError(r'(?P<>)', 'missing group name', 4)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'(?P<1>)', "bad character in group name '1'", 4)
|
|
|
|
|
self.checkPatternError(r'(?P<a.>)', "bad character in group name 'a.'", 4)
|
|
|
|
|
self.checkPatternError(r'(?(', 'missing group name', 3)
|
|
|
|
|
self.checkPatternError(r'(?())', 'missing group name', 3)
|
|
|
|
|
self.checkPatternError(r'(?(a))', "unknown group name 'a'", 3)
|
|
|
|
|
self.checkPatternError(r'(?(-1))', "bad character in group name '-1'", 3)
|
|
|
|
|
self.checkPatternError(r'(?(1a))', "bad character in group name '1a'", 3)
|
|
|
|
|
self.checkPatternError(r'(?(a.))', "bad character in group name 'a.'", 3)
|
|
|
|
|
self.checkPatternError('(?P<©>x)', "bad character in group name '©'", 4)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.checkPatternError('(?P=©)', "bad character in group name '©'", 4)
|
|
|
|
|
self.checkPatternError('(?(©)y)', "bad character in group name '©'", 3)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkPatternError(b'(?P<\xc2\xb5>x)',
|
|
|
|
|
r"bad character in group name '\xc2\xb5'", 4)
|
|
|
|
|
self.checkPatternError(b'(?P=\xc2\xb5)',
|
|
|
|
|
r"bad character in group name '\xc2\xb5'", 4)
|
|
|
|
|
self.checkPatternError(b'(?(\xc2\xb5)y)',
|
|
|
|
|
r"bad character in group name '\xc2\xb5'", 3)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
|
|
|
|
|
def test_symbolic_refs(self):
|
|
|
|
|
self.assertEqual(re.sub('(?P<a>x)|(?P<b>y)', r'\g<b>', 'xx'), '')
|
|
|
|
|
self.assertEqual(re.sub('(?P<a>x)|(?P<b>y)', r'\2', 'xx'), '')
|
|
|
|
|
self.assertEqual(re.sub(b'(?P<a1>x)', br'\g<a1>', b'xx'), b'xx')
|
|
|
|
|
# New valid identifiers in Python 3
|
|
|
|
|
self.assertEqual(re.sub('(?P<µ>x)', r'\g<µ>', 'xx'), 'xx')
|
|
|
|
|
self.assertEqual(re.sub('(?P<𝔘𝔫𝔦𝔠𝔬𝔡𝔢>x)', r'\g<𝔘𝔫𝔦𝔠𝔬𝔡𝔢>', 'xx'), 'xx')
|
2014-09-29 16:49:23 -03:00
|
|
|
|
# Support > 100 groups.
|
|
|
|
|
pat = '|'.join('x(?P<a%d>%x)y' % (i, i) for i in range(1, 200 + 1))
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.assertEqual(re.sub(pat, r'\g<200>', 'xc8yzxc8y'), 'c8zc8')
|
2012-11-03 15:33:08 -03:00
|
|
|
|
|
2022-04-19 10:56:51 -03:00
|
|
|
|
def test_symbolic_refs_errors(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<a', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
'missing >, unterminated name', 3)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
'missing group name', 3)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g', 'xx', 'missing <', 2)
|
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<a a>', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
"bad character in group name 'a a'", 3)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<>', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
'missing group name', 3)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<1a1>', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
"bad character in group name '1a1'", 3)
|
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<2>', 'xx',
|
2016-10-23 06:11:19 -03:00
|
|
|
|
'invalid group reference 2', 3)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\2', 'xx',
|
2016-10-23 06:11:19 -03:00
|
|
|
|
'invalid group reference 2', 1)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
with self.assertRaisesRegex(IndexError, "unknown group name 'ab'"):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
re.sub('(?P<a>x)', r'\g<ab>', 'xx')
|
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<-1>', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
"bad character in group name '-1'", 3)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<+1>', 'xx',
|
|
|
|
|
"bad character in group name '+1'", 3)
|
|
|
|
|
self.checkTemplateError('()'*10, r'\g<1_0>', 'xx',
|
|
|
|
|
"bad character in group name '1_0'", 3)
|
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g< 1 >', 'xx',
|
|
|
|
|
"bad character in group name ' 1 '", 3)
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<©>', 'xx',
|
2015-03-25 16:03:47 -03:00
|
|
|
|
"bad character in group name '©'", 3)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkTemplateError(b'(?P<a>x)', b'\\g<\xc2\xb5>', b'xx',
|
|
|
|
|
r"bad character in group name '\xc2\xb5'", 3)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<㊀>', 'xx',
|
|
|
|
|
"bad character in group name '㊀'", 3)
|
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<¹>', 'xx',
|
|
|
|
|
"bad character in group name '¹'", 3)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkTemplateError('(?P<a>x)', r'\g<१>', 'xx',
|
|
|
|
|
"bad character in group name '१'", 3)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
def test_re_subn(self):
|
|
|
|
|
self.assertEqual(re.subn("(?i)b+", "x", "bbbb BBBB"), ('x x', 2))
|
|
|
|
|
self.assertEqual(re.subn("b+", "x", "bbbb BBBB"), ('x BBBB', 1))
|
|
|
|
|
self.assertEqual(re.subn("b+", "x", "xyz"), ('xyz', 0))
|
|
|
|
|
self.assertEqual(re.subn("b*", "x", "xyz"), ('xxxyxzx', 4))
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
self.assertEqual(re.subn("b*", "x", "xyz", 2), ('xxxyz', 2))
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
2014-10-29 12:58:59 -03:00
|
|
|
|
self.assertEqual(re.subn("b*", "x", "xyz", count=2), ('xxxyz', 2))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"subn\(\) got multiple values for argument 'count'"):
|
|
|
|
|
re.subn('a', 'b', 'aaaaa', 1, count=1)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"subn\(\) got multiple values for argument 'flags'"):
|
|
|
|
|
re.subn('a', 'b', 'aaaaa', 1, 0, flags=0)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"subn\(\) takes from 3 to 5 positional arguments but 6 "
|
|
|
|
|
r"were given"):
|
|
|
|
|
re.subn('a', 'b', 'aaaaa', 1, 0, 0)
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_re_split(self):
|
2013-10-16 06:46:28 -03:00
|
|
|
|
for string in ":a:b::c", S(":a:b::c"):
|
|
|
|
|
self.assertTypedEqual(re.split(":", string),
|
|
|
|
|
['', 'a', 'b', '', 'c'])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split(":+", string),
|
2013-10-16 06:46:28 -03:00
|
|
|
|
['', 'a', 'b', 'c'])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split("(:+)", string),
|
2013-10-16 06:46:28 -03:00
|
|
|
|
['', ':', 'a', ':', 'b', '::', 'c'])
|
|
|
|
|
for string in (b":a:b::c", B(b":a:b::c"), bytearray(b":a:b::c"),
|
|
|
|
|
memoryview(b":a:b::c")):
|
|
|
|
|
self.assertTypedEqual(re.split(b":", string),
|
|
|
|
|
[b'', b'a', b'b', b'', b'c'])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split(b":+", string),
|
2013-10-16 06:46:28 -03:00
|
|
|
|
[b'', b'a', b'b', b'c'])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split(b"(:+)", string),
|
2013-10-16 06:46:28 -03:00
|
|
|
|
[b'', b':', b'a', b':', b'b', b'::', b'c'])
|
2013-10-26 04:45:48 -03:00
|
|
|
|
for a, b, c in ("\xe0\xdf\xe7", "\u0430\u0431\u0432",
|
|
|
|
|
"\U0001d49c\U0001d49e\U0001d4b5"):
|
|
|
|
|
string = ":%s:%s::%s" % (a, b, c)
|
|
|
|
|
self.assertEqual(re.split(":", string), ['', a, b, '', c])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertEqual(re.split(":+", string), ['', a, b, c])
|
|
|
|
|
self.assertEqual(re.split("(:+)", string),
|
2013-10-26 04:45:48 -03:00
|
|
|
|
['', ':', a, ':', b, '::', c])
|
2013-10-16 06:46:28 -03:00
|
|
|
|
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertEqual(re.split("(?::+)", ":a:b::c"), ['', 'a', 'b', 'c'])
|
|
|
|
|
self.assertEqual(re.split("(:)+", ":a:b::c"),
|
2003-04-24 16:43:18 -03:00
|
|
|
|
['', ':', 'a', ':', 'b', ':', 'c'])
|
|
|
|
|
self.assertEqual(re.split("([b:]+)", ":a:b::c"),
|
|
|
|
|
['', ':', 'a', ':b::', 'c'])
|
|
|
|
|
self.assertEqual(re.split("(b)|(:+)", ":a:b::c"),
|
|
|
|
|
['', None, ':', 'a', None, ':', '', 'b', None, '',
|
|
|
|
|
None, '::', 'c'])
|
|
|
|
|
self.assertEqual(re.split("(?:b)|(?::+)", ":a:b::c"),
|
|
|
|
|
['', 'a', '', '', 'c'])
|
|
|
|
|
|
2015-02-03 05:04:19 -04:00
|
|
|
|
for sep, expected in [
|
2018-01-04 05:06:13 -04:00
|
|
|
|
(':*', ['', '', 'a', '', 'b', '', 'c', '']),
|
|
|
|
|
('(?::*)', ['', '', 'a', '', 'b', '', 'c', '']),
|
|
|
|
|
('(:*)', ['', ':', '', '', 'a', ':', '', '', 'b', '::', '', '', 'c', '', '']),
|
|
|
|
|
('(:)*', ['', ':', '', None, 'a', ':', '', None, 'b', ':', '', None, 'c', None, '']),
|
2015-02-03 05:04:19 -04:00
|
|
|
|
]:
|
2017-12-04 08:29:05 -04:00
|
|
|
|
with self.subTest(sep=sep):
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split(sep, ':a:b::c'), expected)
|
|
|
|
|
|
|
|
|
|
for sep, expected in [
|
2017-12-04 08:29:05 -04:00
|
|
|
|
('', ['', ':', 'a', ':', 'b', ':', ':', 'c', '']),
|
|
|
|
|
(r'\b', [':', 'a', ':', 'b', '::', 'c', '']),
|
|
|
|
|
(r'(?=:)', ['', ':a', ':b', ':', ':c']),
|
|
|
|
|
(r'(?<=:)', [':', 'a:', 'b:', ':', 'c']),
|
2015-02-03 05:04:19 -04:00
|
|
|
|
]:
|
2017-12-04 08:29:05 -04:00
|
|
|
|
with self.subTest(sep=sep):
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertTypedEqual(re.split(sep, ':a:b::c'), expected)
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_qualified_re_split(self):
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
|
|
|
|
self.assertEqual(re.split(":", ":a:b::c", 2), ['', 'a', 'b::c'])
|
|
|
|
|
self.assertEqual(w.filename, __file__)
|
2014-10-29 12:58:59 -03:00
|
|
|
|
self.assertEqual(re.split(":", ":a:b::c", maxsplit=2), ['', 'a', 'b::c'])
|
|
|
|
|
self.assertEqual(re.split(':', 'a:b:c:d', maxsplit=2), ['a', 'b', 'c:d'])
|
|
|
|
|
self.assertEqual(re.split("(:)", ":a:b::c", maxsplit=2),
|
2003-04-24 16:43:18 -03:00
|
|
|
|
['', ':', 'a', ':', 'b::c'])
|
2015-02-03 05:04:19 -04:00
|
|
|
|
self.assertEqual(re.split("(:+)", ":a:b::c", maxsplit=2),
|
2003-04-24 16:43:18 -03:00
|
|
|
|
['', ':', 'a', ':', 'b::c'])
|
2017-12-04 08:29:05 -04:00
|
|
|
|
self.assertEqual(re.split("(:*)", ":a:b::c", maxsplit=2),
|
2018-01-04 05:06:13 -04:00
|
|
|
|
['', ':', '', '', 'a:b::c'])
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2023-08-16 17:35:35 -03:00
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"split\(\) got multiple values for argument 'maxsplit'"):
|
|
|
|
|
re.split(":", ":a:b::c", 2, maxsplit=2)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"split\(\) got multiple values for argument 'flags'"):
|
|
|
|
|
re.split(":", ":a:b::c", 2, 0, flags=0)
|
|
|
|
|
with self.assertRaisesRegex(TypeError,
|
|
|
|
|
r"split\(\) takes from 2 to 4 positional arguments but 5 "
|
|
|
|
|
r"were given"):
|
|
|
|
|
re.split(":", ":a:b::c", 2, 0, 0)
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_re_findall(self):
|
|
|
|
|
self.assertEqual(re.findall(":+", "abc"), [])
|
2013-10-16 06:46:28 -03:00
|
|
|
|
for string in "a:b::c:::d", S("a:b::c:::d"):
|
|
|
|
|
self.assertTypedEqual(re.findall(":+", string),
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
self.assertTypedEqual(re.findall("(:+)", string),
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
self.assertTypedEqual(re.findall("(:)(:*)", string),
|
|
|
|
|
[(":", ""), (":", ":"), (":", "::")])
|
|
|
|
|
for string in (b"a:b::c:::d", B(b"a:b::c:::d"), bytearray(b"a:b::c:::d"),
|
|
|
|
|
memoryview(b"a:b::c:::d")):
|
|
|
|
|
self.assertTypedEqual(re.findall(b":+", string),
|
|
|
|
|
[b":", b"::", b":::"])
|
|
|
|
|
self.assertTypedEqual(re.findall(b"(:+)", string),
|
|
|
|
|
[b":", b"::", b":::"])
|
|
|
|
|
self.assertTypedEqual(re.findall(b"(:)(:*)", string),
|
|
|
|
|
[(b":", b""), (b":", b":"), (b":", b"::")])
|
2013-10-26 04:45:48 -03:00
|
|
|
|
for x in ("\xe0", "\u0430", "\U0001d49c"):
|
|
|
|
|
xx = x * 2
|
|
|
|
|
xxx = x * 3
|
|
|
|
|
string = "a%sb%sc%sd" % (x, xx, xxx)
|
|
|
|
|
self.assertEqual(re.findall("%s+" % x, string), [x, xx, xxx])
|
|
|
|
|
self.assertEqual(re.findall("(%s+)" % x, string), [x, xx, xxx])
|
|
|
|
|
self.assertEqual(re.findall("(%s)(%s*)" % (x, x), string),
|
|
|
|
|
[(x, ""), (x, x), (x, xx)])
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2003-04-25 13:00:14 -03:00
|
|
|
|
def test_bug_117612(self):
|
|
|
|
|
self.assertEqual(re.findall(r"(a|(b))", "aba"),
|
|
|
|
|
[("a", ""),("b", "b"),("a", "")])
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_re_match(self):
|
2013-10-16 06:46:28 -03:00
|
|
|
|
for string in 'a', S('a'):
|
|
|
|
|
self.assertEqual(re.match('a', string).groups(), ())
|
|
|
|
|
self.assertEqual(re.match('(a)', string).groups(), ('a',))
|
|
|
|
|
self.assertEqual(re.match('(a)', string).group(0), 'a')
|
|
|
|
|
self.assertEqual(re.match('(a)', string).group(1), 'a')
|
|
|
|
|
self.assertEqual(re.match('(a)', string).group(1, 1), ('a', 'a'))
|
|
|
|
|
for string in b'a', B(b'a'), bytearray(b'a'), memoryview(b'a'):
|
|
|
|
|
self.assertEqual(re.match(b'a', string).groups(), ())
|
|
|
|
|
self.assertEqual(re.match(b'(a)', string).groups(), (b'a',))
|
|
|
|
|
self.assertEqual(re.match(b'(a)', string).group(0), b'a')
|
|
|
|
|
self.assertEqual(re.match(b'(a)', string).group(1), b'a')
|
|
|
|
|
self.assertEqual(re.match(b'(a)', string).group(1, 1), (b'a', b'a'))
|
2013-10-26 04:45:48 -03:00
|
|
|
|
for a in ("\xe0", "\u0430", "\U0001d49c"):
|
|
|
|
|
self.assertEqual(re.match(a, a).groups(), ())
|
|
|
|
|
self.assertEqual(re.match('(%s)' % a, a).groups(), (a,))
|
|
|
|
|
self.assertEqual(re.match('(%s)' % a, a).group(0), a)
|
|
|
|
|
self.assertEqual(re.match('(%s)' % a, a).group(1), a)
|
|
|
|
|
self.assertEqual(re.match('(%s)' % a, a).group(1, 1), (a, a))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
pat = re.compile('((a)|(b))(c)?')
|
|
|
|
|
self.assertEqual(pat.match('a').groups(), ('a', 'a', None, None))
|
|
|
|
|
self.assertEqual(pat.match('b').groups(), ('b', None, 'b', None))
|
|
|
|
|
self.assertEqual(pat.match('ac').groups(), ('a', 'a', None, 'c'))
|
|
|
|
|
self.assertEqual(pat.match('bc').groups(), ('b', None, 'b', 'c'))
|
|
|
|
|
self.assertEqual(pat.match('bc').groups(""), ('b', "", 'b', 'c'))
|
|
|
|
|
|
|
|
|
|
pat = re.compile('(?:(?P<a1>a)|(?P<b2>b))(?P<c3>c)?')
|
|
|
|
|
self.assertEqual(pat.match('a').group(1, 2, 3), ('a', None, None))
|
|
|
|
|
self.assertEqual(pat.match('b').group('a1', 'b2', 'c3'),
|
|
|
|
|
(None, 'b', None))
|
|
|
|
|
self.assertEqual(pat.match('ac').group(1, 'b2', 3), ('a', None, 'c'))
|
|
|
|
|
|
2016-06-18 10:48:07 -03:00
|
|
|
|
def test_group(self):
|
|
|
|
|
class Index:
|
|
|
|
|
def __init__(self, value):
|
|
|
|
|
self.value = value
|
|
|
|
|
def __index__(self):
|
|
|
|
|
return self.value
|
|
|
|
|
# A single group
|
|
|
|
|
m = re.match('(a)(b)', 'ab')
|
|
|
|
|
self.assertEqual(m.group(), 'ab')
|
|
|
|
|
self.assertEqual(m.group(0), 'ab')
|
|
|
|
|
self.assertEqual(m.group(1), 'a')
|
|
|
|
|
self.assertEqual(m.group(Index(1)), 'a')
|
|
|
|
|
self.assertRaises(IndexError, m.group, -1)
|
|
|
|
|
self.assertRaises(IndexError, m.group, 3)
|
|
|
|
|
self.assertRaises(IndexError, m.group, 1<<1000)
|
|
|
|
|
self.assertRaises(IndexError, m.group, Index(1<<1000))
|
|
|
|
|
self.assertRaises(IndexError, m.group, 'x')
|
|
|
|
|
# Multiple groups
|
|
|
|
|
self.assertEqual(m.group(2, 1), ('b', 'a'))
|
|
|
|
|
self.assertEqual(m.group(Index(2), Index(1)), ('b', 'a'))
|
|
|
|
|
|
2016-09-11 09:55:43 -03:00
|
|
|
|
def test_match_getitem(self):
|
|
|
|
|
pat = re.compile('(?:(?P<a1>a)|(?P<b2>b))(?P<c3>c)?')
|
|
|
|
|
|
|
|
|
|
m = pat.match('a')
|
|
|
|
|
self.assertEqual(m['a1'], 'a')
|
|
|
|
|
self.assertEqual(m['b2'], None)
|
|
|
|
|
self.assertEqual(m['c3'], None)
|
|
|
|
|
self.assertEqual('a1={a1} b2={b2} c3={c3}'.format_map(m), 'a1=a b2=None c3=None')
|
|
|
|
|
self.assertEqual(m[0], 'a')
|
|
|
|
|
self.assertEqual(m[1], 'a')
|
|
|
|
|
self.assertEqual(m[2], None)
|
|
|
|
|
self.assertEqual(m[3], None)
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m['X']
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m[-1]
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m[4]
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m[0, 1]
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m[(0,)]
|
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
|
|
|
|
m[(0, 1)]
|
2017-08-03 05:45:23 -03:00
|
|
|
|
with self.assertRaisesRegex(IndexError, 'no such group'):
|
2016-09-11 09:55:43 -03:00
|
|
|
|
'a1={a2}'.format_map(m)
|
|
|
|
|
|
|
|
|
|
m = pat.match('ac')
|
|
|
|
|
self.assertEqual(m['a1'], 'a')
|
|
|
|
|
self.assertEqual(m['b2'], None)
|
|
|
|
|
self.assertEqual(m['c3'], 'c')
|
|
|
|
|
self.assertEqual('a1={a1} b2={b2} c3={c3}'.format_map(m), 'a1=a b2=None c3=c')
|
|
|
|
|
self.assertEqual(m[0], 'ac')
|
|
|
|
|
self.assertEqual(m[1], 'a')
|
|
|
|
|
self.assertEqual(m[2], None)
|
|
|
|
|
self.assertEqual(m[3], 'c')
|
|
|
|
|
|
|
|
|
|
# Cannot assign.
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
m[0] = 1
|
|
|
|
|
|
|
|
|
|
# No len().
|
|
|
|
|
self.assertRaises(TypeError, len, m)
|
|
|
|
|
|
2013-11-23 17:20:30 -04:00
|
|
|
|
def test_re_fullmatch(self):
|
|
|
|
|
# Issue 16203: Proposal: add re.fullmatch() method.
|
|
|
|
|
self.assertEqual(re.fullmatch(r"a", "a").span(), (0, 1))
|
|
|
|
|
for string in "ab", S("ab"):
|
|
|
|
|
self.assertEqual(re.fullmatch(r"a|ab", string).span(), (0, 2))
|
|
|
|
|
for string in b"ab", B(b"ab"), bytearray(b"ab"), memoryview(b"ab"):
|
|
|
|
|
self.assertEqual(re.fullmatch(br"a|ab", string).span(), (0, 2))
|
|
|
|
|
for a, b in "\xe0\xdf", "\u0430\u0431", "\U0001d49c\U0001d49e":
|
|
|
|
|
r = r"%s|%s" % (a, a + b)
|
|
|
|
|
self.assertEqual(re.fullmatch(r, a + b).span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.fullmatch(r".*?$", "abc").span(), (0, 3))
|
|
|
|
|
self.assertEqual(re.fullmatch(r".*?", "abc").span(), (0, 3))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"a.*?b", "ab").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"a.*?b", "abb").span(), (0, 3))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"a.*?b", "axxb").span(), (0, 4))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r"a+", "ab"))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r"abc$", "abc\n"))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r"abc\Z", "abc\n"))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r"(?m)abc$", "abc\n"))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"ab(?=c)cd", "abcd").span(), (0, 4))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"ab(?<=b)cd", "abcd").span(), (0, 4))
|
|
|
|
|
self.assertEqual(re.fullmatch(r"(?=a|ab)ab", "ab").span(), (0, 2))
|
|
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
re.compile(r"bc").fullmatch("abcd", pos=1, endpos=3).span(), (1, 3))
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
re.compile(r".*?$").fullmatch("abcd", pos=1, endpos=3).span(), (1, 3))
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
re.compile(r".*?").fullmatch("abcd", pos=1, endpos=3).span(), (1, 3))
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_re_groupref_exists(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(\()?([^()]+)(?(1)\))$', '(a)').groups(),
|
2003-06-19 21:25:14 -03:00
|
|
|
|
('(', 'a'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(\()?([^()]+)(?(1)\))$', 'a').groups(),
|
2003-06-19 21:25:14 -03:00
|
|
|
|
(None, 'a'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertIsNone(re.match(r'^(\()?([^()]+)(?(1)\))$', 'a)'))
|
|
|
|
|
self.assertIsNone(re.match(r'^(\()?([^()]+)(?(1)\))$', '(a'))
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.match('^(?:(a)|c)((?(1)b|d))$', 'ab').groups(),
|
|
|
|
|
('a', 'b'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(?:(a)|c)((?(1)b|d))$', 'cd').groups(),
|
2003-06-19 21:25:14 -03:00
|
|
|
|
(None, 'd'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(?:(a)|c)((?(1)|d))$', 'cd').groups(),
|
2003-06-19 21:25:14 -03:00
|
|
|
|
(None, 'd'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(?:(a)|c)((?(1)|d))$', 'a').groups(),
|
2003-06-19 21:25:14 -03:00
|
|
|
|
('a', ''))
|
|
|
|
|
|
2005-06-03 10:55:58 -03:00
|
|
|
|
# Tests for bug #1177831: exercise groups other than the first group
|
|
|
|
|
p = re.compile('(?P<g1>a)(?P<g2>b)?((?(g2)c|d))')
|
|
|
|
|
self.assertEqual(p.match('abc').groups(),
|
|
|
|
|
('a', 'b', 'c'))
|
|
|
|
|
self.assertEqual(p.match('ad').groups(),
|
|
|
|
|
('a', None, 'd'))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(p.match('abd'))
|
|
|
|
|
self.assertIsNone(p.match('ac'))
|
2005-06-03 10:55:58 -03:00
|
|
|
|
|
2014-09-29 16:49:23 -03:00
|
|
|
|
# Support > 100 groups.
|
|
|
|
|
pat = '|'.join('x(?P<a%d>%x)y' % (i, i) for i in range(1, 200 + 1))
|
|
|
|
|
pat = '(?:%s)(?(200)z)' % pat
|
|
|
|
|
self.assertEqual(re.match(pat, 'xc8yz').span(), (0, 5))
|
2005-06-02 10:38:45 -03:00
|
|
|
|
|
2022-04-19 10:56:51 -03:00
|
|
|
|
def test_re_groupref_exists_errors(self):
|
|
|
|
|
self.checkPatternError(r'(?P<a>)(?(0)a|b)', 'bad group number', 10)
|
|
|
|
|
self.checkPatternError(r'()(?(-1)a|b)',
|
|
|
|
|
"bad character in group name '-1'", 5)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkPatternError(r'()(?(+1)a|b)',
|
|
|
|
|
"bad character in group name '+1'", 5)
|
|
|
|
|
self.checkPatternError(r'()'*10 + r'(?(1_0)a|b)',
|
|
|
|
|
"bad character in group name '1_0'", 23)
|
|
|
|
|
self.checkPatternError(r'()(?( 1 )a|b)',
|
|
|
|
|
"bad character in group name ' 1 '", 5)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.checkPatternError(r'()(?(㊀)a|b)',
|
|
|
|
|
"bad character in group name '㊀'", 5)
|
|
|
|
|
self.checkPatternError(r'()(?(¹)a|b)',
|
|
|
|
|
"bad character in group name '¹'", 5)
|
2022-05-08 13:19:29 -03:00
|
|
|
|
self.checkPatternError(r'()(?(१)a|b)',
|
|
|
|
|
"bad character in group name '१'", 5)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.checkPatternError(r'()(?(1',
|
|
|
|
|
"missing ), unterminated name", 5)
|
|
|
|
|
self.checkPatternError(r'()(?(1)a',
|
|
|
|
|
"missing ), unterminated subpattern", 2)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'()(?(1)a|b',
|
|
|
|
|
'missing ), unterminated subpattern', 2)
|
2022-04-19 10:56:51 -03:00
|
|
|
|
self.checkPatternError(r'()(?(1)a|b|c',
|
|
|
|
|
'conditional backref with more than '
|
|
|
|
|
'two branches', 10)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'()(?(1)a|b|c)',
|
|
|
|
|
'conditional backref with more than '
|
|
|
|
|
'two branches', 10)
|
2022-04-22 13:53:10 -03:00
|
|
|
|
self.checkPatternError(r'()(?(2)a)',
|
|
|
|
|
"invalid group reference 2", 5)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
|
2022-11-03 04:23:46 -03:00
|
|
|
|
def test_re_groupref_exists_validation_bug(self):
|
|
|
|
|
for i in range(256):
|
|
|
|
|
with self.subTest(code=i):
|
|
|
|
|
re.compile(r'()(?(1)\x%02x?)' % i)
|
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
def test_re_groupref_overflow(self):
|
2022-04-02 05:35:13 -03:00
|
|
|
|
from re._constants import MAXGROUPS
|
2016-10-23 06:11:19 -03:00
|
|
|
|
self.checkTemplateError('()', r'\g<%s>' % MAXGROUPS, 'xx',
|
|
|
|
|
'invalid group reference %d' % MAXGROUPS, 3)
|
|
|
|
|
self.checkPatternError(r'(?P<a>)(?(%d))' % MAXGROUPS,
|
|
|
|
|
'invalid group reference %d' % MAXGROUPS, 10)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_re_groupref(self):
|
|
|
|
|
self.assertEqual(re.match(r'^(\|)?([^()]+)\1$', '|a|').groups(),
|
|
|
|
|
('|', 'a'))
|
|
|
|
|
self.assertEqual(re.match(r'^(\|)?([^()]+)\1?$', 'a').groups(),
|
|
|
|
|
(None, 'a'))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.match(r'^(\|)?([^()]+)\1$', 'a|'))
|
|
|
|
|
self.assertIsNone(re.match(r'^(\|)?([^()]+)\1$', '|a'))
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.match(r'^(?:(a)|c)(\1)$', 'aa').groups(),
|
|
|
|
|
('a', 'a'))
|
|
|
|
|
self.assertEqual(re.match(r'^(?:(a)|c)(\1)?$', 'c').groups(),
|
|
|
|
|
(None, None))
|
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'(abc\1)', 'cannot refer to an open group', 4)
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_groupdict(self):
|
|
|
|
|
self.assertEqual(re.match('(?P<first>first) (?P<second>second)',
|
|
|
|
|
'first second').groupdict(),
|
|
|
|
|
{'first':'first', 'second':'second'})
|
|
|
|
|
|
|
|
|
|
def test_expand(self):
|
|
|
|
|
self.assertEqual(re.match("(?P<first>first) (?P<second>second)",
|
|
|
|
|
"first second")
|
|
|
|
|
.expand(r"\2 \1 \g<second> \g<first>"),
|
|
|
|
|
"second first second first")
|
2014-10-10 05:06:31 -03:00
|
|
|
|
self.assertEqual(re.match("(?P<first>first)|(?P<second>second)",
|
|
|
|
|
"first")
|
|
|
|
|
.expand(r"\2 \g<second>"),
|
|
|
|
|
" ")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
|
|
|
|
def test_repeat_minmax(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1}$", "abc"))
|
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1}?$", "abc"))
|
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1,2}$", "abc"))
|
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1,2}?$", "abc"))
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){3}$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,3}$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,4}$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){3,4}?$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){3}?$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,3}?$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,4}?$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){3,4}?$", "abc").group(1), "c")
|
|
|
|
|
|
|
|
|
|
self.assertIsNone(re.match(r"^x{1}$", "xxx"))
|
|
|
|
|
self.assertIsNone(re.match(r"^x{1}?$", "xxx"))
|
|
|
|
|
self.assertIsNone(re.match(r"^x{1,2}$", "xxx"))
|
|
|
|
|
self.assertIsNone(re.match(r"^x{1,2}?$", "xxx"))
|
|
|
|
|
|
|
|
|
|
self.assertTrue(re.match(r"^x{3}$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{1,3}$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{3,3}$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{1,4}$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{3,4}?$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{3}?$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{1,3}?$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{1,4}?$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{3,4}?$", "xxx"))
|
|
|
|
|
|
|
|
|
|
self.assertIsNone(re.match(r"^x{}$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match(r"^x{}$", "x{}"))
|
2005-09-14 05:54:39 -03:00
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'x{2,1}',
|
|
|
|
|
'min repeat greater than max repeat', 2)
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_getattr(self):
|
2008-07-02 17:50:16 -03:00
|
|
|
|
self.assertEqual(re.compile("(?i)(a)(b)").pattern, "(?i)(a)(b)")
|
2008-08-19 14:56:33 -03:00
|
|
|
|
self.assertEqual(re.compile("(?i)(a)(b)").flags, re.I | re.U)
|
2008-07-02 17:50:16 -03:00
|
|
|
|
self.assertEqual(re.compile("(?i)(a)(b)").groups, 2)
|
|
|
|
|
self.assertEqual(re.compile("(?i)(a)(b)").groupindex, {})
|
|
|
|
|
self.assertEqual(re.compile("(?i)(?P<first>a)(?P<other>b)").groupindex,
|
|
|
|
|
{'first': 1, 'other': 2})
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.match("(a)", "a").pos, 0)
|
|
|
|
|
self.assertEqual(re.match("(a)", "a").endpos, 1)
|
|
|
|
|
self.assertEqual(re.match("(a)", "a").string, "a")
|
|
|
|
|
self.assertEqual(re.match("(a)", "a").regs, ((0, 1), (0, 1)))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match("(a)", "a").re)
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2015-03-29 19:01:48 -03:00
|
|
|
|
# Issue 14260. groupindex should be non-modifiable mapping.
|
|
|
|
|
p = re.compile(r'(?i)(?P<first>a)(?P<other>b)')
|
|
|
|
|
self.assertEqual(sorted(p.groupindex), ['first', 'other'])
|
|
|
|
|
self.assertEqual(p.groupindex['other'], 2)
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
p.groupindex['other'] = 0
|
|
|
|
|
self.assertEqual(p.groupindex['other'], 2)
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_special_escapes(self):
|
|
|
|
|
self.assertEqual(re.search(r"\b(b.)\b",
|
|
|
|
|
"abcd abc bcd bx").group(1), "bx")
|
|
|
|
|
self.assertEqual(re.search(r"\B(b.)\B",
|
|
|
|
|
"abc bcd bc abxd").group(1), "bx")
|
|
|
|
|
self.assertEqual(re.search(r"\b(b.)\b",
|
2014-09-14 09:56:27 -03:00
|
|
|
|
"abcd abc bcd bx", re.ASCII).group(1), "bx")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.search(r"\B(b.)\B",
|
2014-09-14 09:56:27 -03:00
|
|
|
|
"abc bcd bc abxd", re.ASCII).group(1), "bx")
|
2007-05-02 16:09:54 -03:00
|
|
|
|
self.assertEqual(re.search(r"^abc$", "\nabc\n", re.M).group(0), "abc")
|
|
|
|
|
self.assertEqual(re.search(r"^\Aabc\Z$", "abc", re.M).group(0), "abc")
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.search(r"^\Aabc\Z$", "\nabc\n", re.M))
|
2014-09-14 09:56:27 -03:00
|
|
|
|
self.assertEqual(re.search(br"\b(b.)\b",
|
|
|
|
|
b"abcd abc bcd bx").group(1), b"bx")
|
|
|
|
|
self.assertEqual(re.search(br"\B(b.)\B",
|
|
|
|
|
b"abc bcd bc abxd").group(1), b"bx")
|
|
|
|
|
self.assertEqual(re.search(br"\b(b.)\b",
|
|
|
|
|
b"abcd abc bcd bx", re.LOCALE).group(1), b"bx")
|
|
|
|
|
self.assertEqual(re.search(br"\B(b.)\B",
|
|
|
|
|
b"abc bcd bc abxd", re.LOCALE).group(1), b"bx")
|
|
|
|
|
self.assertEqual(re.search(br"^abc$", b"\nabc\n", re.M).group(0), b"abc")
|
|
|
|
|
self.assertEqual(re.search(br"^\Aabc\Z$", b"abc", re.M).group(0), b"abc")
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.search(br"^\Aabc\Z$", b"\nabc\n", re.M))
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.search(r"\d\D\w\W\s\S",
|
|
|
|
|
"1aa! a").group(0), "1aa! a")
|
2014-09-14 09:56:27 -03:00
|
|
|
|
self.assertEqual(re.search(br"\d\D\w\W\s\S",
|
|
|
|
|
b"1aa! a").group(0), b"1aa! a")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.search(r"\d\D\w\W\s\S",
|
2014-09-14 09:56:27 -03:00
|
|
|
|
"1aa! a", re.ASCII).group(0), "1aa! a")
|
|
|
|
|
self.assertEqual(re.search(br"\d\D\w\W\s\S",
|
|
|
|
|
b"1aa! a", re.LOCALE).group(0), b"1aa! a")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2014-11-10 08:38:16 -04:00
|
|
|
|
def test_other_escapes(self):
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError("\\", 'bad escape (end of pattern)', 0)
|
2014-11-10 08:38:16 -04:00
|
|
|
|
self.assertEqual(re.match(r"\(", '(').group(), '(')
|
|
|
|
|
self.assertIsNone(re.match(r"\(", ')'))
|
|
|
|
|
self.assertEqual(re.match(r"\\", '\\').group(), '\\')
|
|
|
|
|
self.assertEqual(re.match(r"[\]]", ']').group(), ']')
|
|
|
|
|
self.assertIsNone(re.match(r"[\]]", '['))
|
|
|
|
|
self.assertEqual(re.match(r"[a\-c]", '-').group(), '-')
|
|
|
|
|
self.assertIsNone(re.match(r"[a\-c]", 'b'))
|
|
|
|
|
self.assertEqual(re.match(r"[\^a]+", 'a^').group(), 'a^')
|
|
|
|
|
self.assertIsNone(re.match(r"[\^a]+", 'b'))
|
2015-03-24 17:58:14 -03:00
|
|
|
|
re.purge() # for warnings
|
|
|
|
|
for c in 'ceghijklmopqyzCEFGHIJKLMNOPQRTVXY':
|
|
|
|
|
with self.subTest(c):
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, '\\%c' % c)
|
2015-03-24 17:58:14 -03:00
|
|
|
|
for c in 'ceghijklmopqyzABCEFGHIJKLMNOPQRTVXYZ':
|
|
|
|
|
with self.subTest(c):
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, '[\\%c]' % c)
|
2014-11-10 08:38:16 -04:00
|
|
|
|
|
2018-02-09 18:08:17 -04:00
|
|
|
|
def test_named_unicode_escapes(self):
|
|
|
|
|
# test individual Unicode named escapes
|
|
|
|
|
self.assertTrue(re.match(r'\N{LESS-THAN SIGN}', '<'))
|
|
|
|
|
self.assertTrue(re.match(r'\N{less-than sign}', '<'))
|
|
|
|
|
self.assertIsNone(re.match(r'\N{LESS-THAN SIGN}', '>'))
|
|
|
|
|
self.assertTrue(re.match(r'\N{SNAKE}', '\U0001f40d'))
|
|
|
|
|
self.assertTrue(re.match(r'\N{ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH '
|
|
|
|
|
r'HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM}',
|
|
|
|
|
'\ufbf9'))
|
|
|
|
|
self.assertTrue(re.match(r'[\N{LESS-THAN SIGN}-\N{GREATER-THAN SIGN}]',
|
|
|
|
|
'='))
|
|
|
|
|
self.assertIsNone(re.match(r'[\N{LESS-THAN SIGN}-\N{GREATER-THAN SIGN}]',
|
|
|
|
|
';'))
|
|
|
|
|
|
|
|
|
|
# test errors in \N{name} handling - only valid names should pass
|
|
|
|
|
self.checkPatternError(r'\N', 'missing {', 2)
|
|
|
|
|
self.checkPatternError(r'[\N]', 'missing {', 3)
|
|
|
|
|
self.checkPatternError(r'\N{', 'missing character name', 3)
|
|
|
|
|
self.checkPatternError(r'[\N{', 'missing character name', 4)
|
|
|
|
|
self.checkPatternError(r'\N{}', 'missing character name', 3)
|
|
|
|
|
self.checkPatternError(r'[\N{}]', 'missing character name', 4)
|
|
|
|
|
self.checkPatternError(r'\NSNAKE}', 'missing {', 2)
|
|
|
|
|
self.checkPatternError(r'[\NSNAKE}]', 'missing {', 3)
|
|
|
|
|
self.checkPatternError(r'\N{SNAKE',
|
|
|
|
|
'missing }, unterminated name', 3)
|
|
|
|
|
self.checkPatternError(r'[\N{SNAKE]',
|
|
|
|
|
'missing }, unterminated name', 4)
|
|
|
|
|
self.checkPatternError(r'[\N{SNAKE]}',
|
|
|
|
|
"undefined character name 'SNAKE]'", 1)
|
|
|
|
|
self.checkPatternError(r'\N{SPAM}',
|
|
|
|
|
"undefined character name 'SPAM'", 0)
|
|
|
|
|
self.checkPatternError(r'[\N{SPAM}]',
|
|
|
|
|
"undefined character name 'SPAM'", 1)
|
2022-04-22 12:35:28 -03:00
|
|
|
|
self.checkPatternError(r'\N{KEYCAP NUMBER SIGN}',
|
|
|
|
|
"undefined character name 'KEYCAP NUMBER SIGN'", 0)
|
|
|
|
|
self.checkPatternError(r'[\N{KEYCAP NUMBER SIGN}]',
|
|
|
|
|
"undefined character name 'KEYCAP NUMBER SIGN'", 1)
|
2018-02-09 18:08:17 -04:00
|
|
|
|
self.checkPatternError(br'\N{LESS-THAN SIGN}', r'bad escape \N', 0)
|
|
|
|
|
self.checkPatternError(br'[\N{LESS-THAN SIGN}]', r'bad escape \N', 1)
|
|
|
|
|
|
2012-02-29 05:48:44 -04:00
|
|
|
|
def test_string_boundaries(self):
|
|
|
|
|
# See http://bugs.python.org/issue10713
|
|
|
|
|
self.assertEqual(re.search(r"\b(abc)\b", "abc").group(1),
|
|
|
|
|
"abc")
|
|
|
|
|
# There's a word boundary at the start of a string.
|
|
|
|
|
self.assertTrue(re.match(r"\b", "abc"))
|
|
|
|
|
# A non-empty string includes a non-boundary zero-length match.
|
|
|
|
|
self.assertTrue(re.search(r"\B", "abc"))
|
|
|
|
|
# There is no non-boundary match at the start of a string.
|
|
|
|
|
self.assertFalse(re.match(r"\B", "abc"))
|
|
|
|
|
# However, an empty string contains no word boundaries, and also no
|
|
|
|
|
# non-boundaries.
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.search(r"\B", ""))
|
2012-02-29 05:48:44 -04:00
|
|
|
|
# This one is questionable and different from the perlre behaviour,
|
|
|
|
|
# but describes current behavior.
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.search(r"\b", ""))
|
2012-02-29 05:48:44 -04:00
|
|
|
|
# A single word-character string has two boundaries, but no
|
|
|
|
|
# non-boundary gaps.
|
|
|
|
|
self.assertEqual(len(re.findall(r"\b", "a")), 2)
|
|
|
|
|
self.assertEqual(len(re.findall(r"\B", "a")), 0)
|
|
|
|
|
# If there are no words, there are no boundaries
|
|
|
|
|
self.assertEqual(len(re.findall(r"\b", " ")), 0)
|
|
|
|
|
self.assertEqual(len(re.findall(r"\b", " ")), 0)
|
|
|
|
|
# Can match around the whitespace.
|
|
|
|
|
self.assertEqual(len(re.findall(r"\B", " ")), 2)
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_bigcharset(self):
|
2007-05-02 16:09:54 -03:00
|
|
|
|
self.assertEqual(re.match("([\u2222\u2223])",
|
|
|
|
|
"\u2222").group(1), "\u2222")
|
2013-10-24 16:02:58 -03:00
|
|
|
|
r = '[%s]' % ''.join(map(chr, range(256, 2**16, 255)))
|
2014-09-14 09:56:27 -03:00
|
|
|
|
self.assertEqual(re.match(r, "\uff01").group(), "\uff01")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2012-11-20 17:30:42 -04:00
|
|
|
|
def test_big_codesize(self):
|
|
|
|
|
# Issue #1160
|
|
|
|
|
r = re.compile('|'.join(('%d'%x for x in range(10000))))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(r.match('1000'))
|
|
|
|
|
self.assertTrue(r.match('9999'))
|
2012-11-20 17:30:42 -04:00
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_anyall(self):
|
|
|
|
|
self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
|
|
|
|
|
"a\nb")
|
|
|
|
|
self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0),
|
|
|
|
|
"a\n\nb")
|
|
|
|
|
|
2015-02-21 04:07:35 -04:00
|
|
|
|
def test_lookahead(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r"(a(?=\s[^a]))", "a b").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a(?=\s[^a]*))", "a b").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a(?=\s[abc]))", "a b").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a(?=\s[abc]*))", "a bc").group(1), "a")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.match(r"(a)(?=\s\1)", "a a").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a)(?=\s\1*)", "a aa").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a)(?=\s(abc|a))", "a a").group(1), "a")
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.match(r"(a(?!\s[^a]))", "a a").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a(?!\s[abc]))", "a d").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a")
|
|
|
|
|
self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a")
|
|
|
|
|
|
2015-02-21 04:07:35 -04:00
|
|
|
|
# Group reference.
|
|
|
|
|
self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba'))
|
|
|
|
|
self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac'))
|
|
|
|
|
# Conditional group reference.
|
|
|
|
|
self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(2)x|c))c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:(a)|(x))b(?=(?(2)c|x))c', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(2)x|c))c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:(a)|(x))b(?=(?(1)b|x))c', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(1)c|x))c', 'abc'))
|
|
|
|
|
# Group used before defined.
|
|
|
|
|
self.assertTrue(re.match(r'(a)b(?=(?(2)x|c))(c)', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(a)b(?=(?(2)b|x))(c)', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(a)b(?=(?(1)c|x))(c)', 'abc'))
|
|
|
|
|
|
|
|
|
|
def test_lookbehind(self):
|
|
|
|
|
self.assertTrue(re.match(r'ab(?<=b)c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'ab(?<=c)c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'ab(?<!b)c', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'ab(?<!c)c', 'abc'))
|
|
|
|
|
# Group reference.
|
|
|
|
|
self.assertTrue(re.match(r'(a)a(?<=\1)c', 'aac'))
|
|
|
|
|
self.assertIsNone(re.match(r'(a)b(?<=\1)a', 'abaa'))
|
|
|
|
|
self.assertIsNone(re.match(r'(a)a(?<!\1)c', 'aac'))
|
|
|
|
|
self.assertTrue(re.match(r'(a)b(?<!\1)a', 'abaa'))
|
|
|
|
|
# Conditional group reference.
|
|
|
|
|
self.assertIsNone(re.match(r'(?:(a)|(x))b(?<=(?(2)x|c))c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:(a)|(x))b(?<=(?(2)b|x))c', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(?:(a)|(x))b(?<=(?(2)x|b))c', 'abc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:(a)|(x))b(?<=(?(1)c|x))c', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(?:(a)|(x))b(?<=(?(1)b|x))c', 'abc'))
|
|
|
|
|
# Group used before defined.
|
|
|
|
|
self.assertRaises(re.error, re.compile, r'(a)b(?<=(?(2)b|x))(c)')
|
|
|
|
|
self.assertIsNone(re.match(r'(a)b(?<=(?(1)c|x))(c)', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(a)b(?<=(?(1)b|x))(c)', 'abc'))
|
|
|
|
|
# Group defined in the same lookbehind pattern
|
|
|
|
|
self.assertRaises(re.error, re.compile, r'(a)b(?<=(.)\2)(c)')
|
|
|
|
|
self.assertRaises(re.error, re.compile, r'(a)b(?<=(?P<a>.)(?P=a))(c)')
|
|
|
|
|
self.assertRaises(re.error, re.compile, r'(a)b(?<=(a)(?(2)b|x))(c)')
|
|
|
|
|
self.assertRaises(re.error, re.compile, r'(a)b(?<=(.)(?<=\2))(c)')
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_ignore_case(self):
|
Merged revisions 65910,65977,65980,65984,65986,66000,66011-66012,66014,66017,66020 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65910 | benjamin.peterson | 2008-08-20 09:07:59 -0500 (Wed, 20 Aug 2008) | 1 line
fix up the multiprocessing docs a little
........
r65977 | christian.heimes | 2008-08-22 14:47:25 -0500 (Fri, 22 Aug 2008) | 3 lines
Silenced compiler warning
Objects/stringlib/find.h:97: warning: 'stringlib_contains_obj' defined but not used
Reviewed by Benjamin Peterson
........
r65980 | christian.heimes | 2008-08-22 15:10:27 -0500 (Fri, 22 Aug 2008) | 3 lines
Fixed two format strings in the _collections module. For example
Modules/_collectionsmodule.c:674: warning: format '%i' expects type 'int', but argument 2 has type 'Py_ssize_t'
Reviewed by Benjamin Peterson
........
r65984 | christian.heimes | 2008-08-22 16:23:47 -0500 (Fri, 22 Aug 2008) | 1 line
d is the correct format string
........
r65986 | mark.hammond | 2008-08-22 19:59:14 -0500 (Fri, 22 Aug 2008) | 2 lines
Fix bug 3625: test issues on 64bit windows. r=pitrou
........
r66000 | benjamin.peterson | 2008-08-23 15:27:43 -0500 (Sat, 23 Aug 2008) | 5 lines
#3643 add a few more checks to _testcapi to prevent segfaults
Author: Victor Stinner
Reviewer: Benjamin Peterson
........
r66011 | neal.norwitz | 2008-08-24 12:27:43 -0500 (Sun, 24 Aug 2008) | 1 line
Ignore a couple more tests that report leaks inconsistently.
........
r66012 | neal.norwitz | 2008-08-24 12:29:53 -0500 (Sun, 24 Aug 2008) | 1 line
Use the actual blacklist of leaky tests
........
r66014 | georg.brandl | 2008-08-24 13:11:07 -0500 (Sun, 24 Aug 2008) | 2 lines
#3654: fix duplicate test method name. Review by Benjamin P.
........
r66017 | benjamin.peterson | 2008-08-24 16:55:03 -0500 (Sun, 24 Aug 2008) | 1 line
remove note about unimplemented feature
........
r66020 | brett.cannon | 2008-08-24 18:15:19 -0500 (Sun, 24 Aug 2008) | 1 line
Clarify that some attributes/methods are listed somewhat separately because they are not part of the threading API.
........
2008-08-25 18:05:21 -03:00
|
|
|
|
self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC")
|
2014-09-14 09:56:27 -03:00
|
|
|
|
self.assertEqual(re.match(b"abc", b"ABC", re.I).group(0), b"ABC")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
self.assertEqual(re.match(r"(a\s[^a])", "a b", re.I).group(1), "a b")
|
|
|
|
|
self.assertEqual(re.match(r"(a\s[^a]*)", "a bb", re.I).group(1), "a bb")
|
|
|
|
|
self.assertEqual(re.match(r"(a\s[abc])", "a b", re.I).group(1), "a b")
|
|
|
|
|
self.assertEqual(re.match(r"(a\s[abc]*)", "a bb", re.I).group(1), "a bb")
|
|
|
|
|
self.assertEqual(re.match(r"((a)\s\2)", "a a", re.I).group(1), "a a")
|
|
|
|
|
self.assertEqual(re.match(r"((a)\s\2*)", "a aa", re.I).group(1), "a aa")
|
|
|
|
|
self.assertEqual(re.match(r"((a)\s(abc|a))", "a a", re.I).group(1), "a a")
|
|
|
|
|
self.assertEqual(re.match(r"((a)\s(abc|a)*)", "a aa", re.I).group(1), "a aa")
|
|
|
|
|
|
2022-04-18 06:26:30 -03:00
|
|
|
|
# Two different characters have the same lowercase.
|
|
|
|
|
assert 'K'.lower() == '\u212a'.lower() == 'k' # 'K'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'K', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'k', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u212a', 'K', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u212a', 'k', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase.
|
|
|
|
|
assert 's'.upper() == '\u017f'.upper() == 'S' # 'ſ'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'S', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r's', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u017f', 'S', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u017f', 's', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase. Unicode 9.0+.
|
|
|
|
|
assert '\u0432'.upper() == '\u1c80'.upper() == '\u0412' # 'в', 'ᲀ', 'В'
|
|
|
|
|
self.assertTrue(re.match(r'\u0412', '\u0432', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u0412', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u0432', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u0432', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u1c80', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\u1c80', '\u0432', re.I))
|
|
|
|
|
|
|
|
|
|
# Two different characters have the same multicharacter uppercase.
|
2014-11-10 06:37:16 -04:00
|
|
|
|
assert '\ufb05'.upper() == '\ufb06'.upper() == 'ST' # 'ſt', 'st'
|
|
|
|
|
self.assertTrue(re.match(r'\ufb05', '\ufb06', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'\ufb06', '\ufb05', re.I))
|
|
|
|
|
|
|
|
|
|
def test_ignore_case_set(self):
|
|
|
|
|
self.assertTrue(re.match(r'[19A]', 'A', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19a]', 'a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19a]', 'A', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19A]', 'a', re.I))
|
|
|
|
|
self.assertTrue(re.match(br'[19A]', b'A', re.I))
|
|
|
|
|
self.assertTrue(re.match(br'[19a]', b'a', re.I))
|
|
|
|
|
self.assertTrue(re.match(br'[19a]', b'A', re.I))
|
|
|
|
|
self.assertTrue(re.match(br'[19A]', b'a', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same lowercase.
|
|
|
|
|
assert 'K'.lower() == '\u212a'.lower() == 'k' # 'K'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'[19K]', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19k]', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u212a]', 'K', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u212a]', 'k', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase.
|
|
|
|
|
assert 's'.upper() == '\u017f'.upper() == 'S' # 'ſ'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'[19S]', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19s]', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u017f]', 'S', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u017f]', 's', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase. Unicode 9.0+.
|
|
|
|
|
assert '\u0432'.upper() == '\u1c80'.upper() == '\u0412' # 'в', 'ᲀ', 'В'
|
|
|
|
|
self.assertTrue(re.match(r'[19\u0412]', '\u0432', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u0412]', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u0432]', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u0432]', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u1c80]', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\u1c80]', '\u0432', re.I))
|
|
|
|
|
|
|
|
|
|
# Two different characters have the same multicharacter uppercase.
|
2014-11-10 06:37:16 -04:00
|
|
|
|
assert '\ufb05'.upper() == '\ufb06'.upper() == 'ST' # 'ſt', 'st'
|
|
|
|
|
self.assertTrue(re.match(r'[19\ufb05]', '\ufb06', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[19\ufb06]', '\ufb05', re.I))
|
|
|
|
|
|
2014-10-31 07:36:56 -03:00
|
|
|
|
def test_ignore_case_range(self):
|
|
|
|
|
# Issues #3511, #17381.
|
|
|
|
|
self.assertTrue(re.match(r'[9-a]', '_', re.I))
|
|
|
|
|
self.assertIsNone(re.match(r'[9-A]', '_', re.I))
|
|
|
|
|
self.assertTrue(re.match(br'[9-a]', b'_', re.I))
|
|
|
|
|
self.assertIsNone(re.match(br'[9-A]', b'_', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\xc0-\xde]', '\xd7', re.I))
|
|
|
|
|
self.assertIsNone(re.match(r'[\xc0-\xde]', '\xf7', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\xe0-\xfe]', '\xf7', re.I))
|
|
|
|
|
self.assertIsNone(re.match(r'[\xe0-\xfe]', '\xd7', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0430-\u045f]', '\u0450', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0430-\u045f]', '\u0400', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0400-\u042f]', '\u0450', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0400-\u042f]', '\u0400', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\U00010428-\U0001044f]', '\U00010428', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\U00010428-\U0001044f]', '\U00010400', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\U00010400-\U00010427]', '\U00010428', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\U00010400-\U00010427]', '\U00010400', re.I))
|
|
|
|
|
|
2022-04-18 06:26:30 -03:00
|
|
|
|
# Two different characters have the same lowercase.
|
|
|
|
|
assert 'K'.lower() == '\u212a'.lower() == 'k' # 'K'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'[J-M]', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[j-m]', '\u212a', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u2129-\u212b]', 'K', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u2129-\u212b]', 'k', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase.
|
|
|
|
|
assert 's'.upper() == '\u017f'.upper() == 'S' # 'ſ'
|
2014-11-10 06:37:16 -04:00
|
|
|
|
self.assertTrue(re.match(r'[R-T]', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[r-t]', '\u017f', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u017e-\u0180]', 'S', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u017e-\u0180]', 's', re.I))
|
2022-04-18 06:26:30 -03:00
|
|
|
|
|
|
|
|
|
# Two different characters have the same uppercase. Unicode 9.0+.
|
|
|
|
|
assert '\u0432'.upper() == '\u1c80'.upper() == '\u0412' # 'в', 'ᲀ', 'В'
|
|
|
|
|
self.assertTrue(re.match(r'[\u0411-\u0413]', '\u0432', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0411-\u0413]', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0431-\u0433]', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u0431-\u0433]', '\u1c80', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u1c80-\u1c82]', '\u0412', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\u1c80-\u1c82]', '\u0432', re.I))
|
|
|
|
|
|
|
|
|
|
# Two different characters have the same multicharacter uppercase.
|
2014-11-10 06:37:16 -04:00
|
|
|
|
assert '\ufb05'.upper() == '\ufb06'.upper() == 'ST' # 'ſt', 'st'
|
|
|
|
|
self.assertTrue(re.match(r'[\ufb04-\ufb05]', '\ufb06', re.I))
|
|
|
|
|
self.assertTrue(re.match(r'[\ufb06-\ufb07]', '\ufb05', re.I))
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_category(self):
|
|
|
|
|
self.assertEqual(re.match(r"(\s)", " ").group(1), " ")
|
|
|
|
|
|
|
|
|
|
def test_not_literal(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.search(r"\s([^a])", " b").group(1), "b")
|
|
|
|
|
self.assertEqual(re.search(r"\s([^a]*)", " bb").group(1), "bb")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2017-11-16 06:38:26 -04:00
|
|
|
|
def test_possible_set_operations(self):
|
|
|
|
|
s = bytes(range(128)).decode()
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[0-9--1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('-./0123456789'))
|
|
|
|
|
self.assertEqual(re.findall(r'[--1]', s), list('-./01'))
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[%--1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list("%&'()*+,-1"))
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[%--]')
|
|
|
|
|
self.assertEqual(p.findall(s), list("%&'()*+,-"))
|
|
|
|
|
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[0-9&&1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('&0123456789'))
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[\d&&1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('&0123456789'))
|
|
|
|
|
self.assertEqual(re.findall(r'[&&1]', s), list('&1'))
|
|
|
|
|
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[0-9||a]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('0123456789a|'))
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[\d||a]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('0123456789a|'))
|
|
|
|
|
self.assertEqual(re.findall(r'[||1]', s), list('1|'))
|
|
|
|
|
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[0-9~~1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('0123456789~'))
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[\d~~1]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('0123456789~'))
|
|
|
|
|
self.assertEqual(re.findall(r'[~~1]', s), list('1~'))
|
|
|
|
|
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[[0-9]|]')
|
|
|
|
|
self.assertEqual(p.findall(s), list('0123456789[]'))
|
|
|
|
|
|
|
|
|
|
with self.assertWarns(FutureWarning):
|
|
|
|
|
p = re.compile(r'[[:digit:]|]')
|
|
|
|
|
self.assertEqual(p.findall(s), list(':[]dgit'))
|
|
|
|
|
|
2003-06-19 21:25:14 -03:00
|
|
|
|
def test_search_coverage(self):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.search(r"\s(b)", " b").group(1), "b")
|
|
|
|
|
self.assertEqual(re.search(r"a\s", "a ").group(0), "a ")
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2011-03-25 09:08:44 -03:00
|
|
|
|
def assertMatch(self, pattern, text, match=None, span=None,
|
2017-04-13 15:06:43 -03:00
|
|
|
|
matcher=re.fullmatch):
|
2011-03-25 09:08:44 -03:00
|
|
|
|
if match is None and span is None:
|
|
|
|
|
# the pattern matches the whole text
|
|
|
|
|
match = text
|
|
|
|
|
span = (0, len(text))
|
|
|
|
|
elif match is None or span is None:
|
|
|
|
|
raise ValueError('If match is not None, span should be specified '
|
|
|
|
|
'(and vice versa).')
|
|
|
|
|
m = matcher(pattern, text)
|
|
|
|
|
self.assertTrue(m)
|
|
|
|
|
self.assertEqual(m.group(), match)
|
|
|
|
|
self.assertEqual(m.span(), span)
|
|
|
|
|
|
2017-11-16 06:38:26 -04:00
|
|
|
|
LITERAL_CHARS = string.ascii_letters + string.digits + '!"%\',/:;<=>@_`'
|
2017-04-13 15:06:43 -03:00
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_re_escape(self):
|
2011-03-25 09:08:44 -03:00
|
|
|
|
p = ''.join(chr(i) for i in range(256))
|
|
|
|
|
for c in p:
|
|
|
|
|
self.assertMatch(re.escape(c), c)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
self.assertMatch('[' + re.escape(c) + ']', c)
|
|
|
|
|
self.assertMatch('(?x)' + re.escape(c), c)
|
2011-03-25 09:08:44 -03:00
|
|
|
|
self.assertMatch(re.escape(p), p)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
for c in '-.]{}':
|
|
|
|
|
self.assertEqual(re.escape(c)[:1], '\\')
|
|
|
|
|
literal_chars = self.LITERAL_CHARS
|
|
|
|
|
self.assertEqual(re.escape(literal_chars), literal_chars)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2017-04-13 15:06:43 -03:00
|
|
|
|
def test_re_escape_bytes(self):
|
2011-03-25 09:08:44 -03:00
|
|
|
|
p = bytes(range(256))
|
|
|
|
|
for i in p:
|
2008-09-10 14:44:35 -03:00
|
|
|
|
b = bytes([i])
|
2011-03-25 09:08:44 -03:00
|
|
|
|
self.assertMatch(re.escape(b), b)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
self.assertMatch(b'[' + re.escape(b) + b']', b)
|
|
|
|
|
self.assertMatch(b'(?x)' + re.escape(b), b)
|
2011-03-25 09:08:44 -03:00
|
|
|
|
self.assertMatch(re.escape(p), p)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
for i in b'-.]{}':
|
|
|
|
|
b = bytes([i])
|
|
|
|
|
self.assertEqual(re.escape(b)[:1], b'\\')
|
|
|
|
|
literal_chars = self.LITERAL_CHARS.encode('ascii')
|
|
|
|
|
self.assertEqual(re.escape(literal_chars), literal_chars)
|
2008-09-10 14:44:35 -03:00
|
|
|
|
|
2011-03-25 09:09:33 -03:00
|
|
|
|
def test_re_escape_non_ascii(self):
|
|
|
|
|
s = 'xxx\u2620\u2620\u2620xxx'
|
|
|
|
|
s_escaped = re.escape(s)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
self.assertEqual(s_escaped, s)
|
2011-03-25 09:09:33 -03:00
|
|
|
|
self.assertMatch(s_escaped, s)
|
|
|
|
|
self.assertMatch('.%s+.' % re.escape('\u2620'), s,
|
|
|
|
|
'x\u2620\u2620\u2620x', (2, 7), re.search)
|
|
|
|
|
|
|
|
|
|
def test_re_escape_non_ascii_bytes(self):
|
|
|
|
|
b = 'y\u2620y\u2620y'.encode('utf-8')
|
|
|
|
|
b_escaped = re.escape(b)
|
2017-04-13 15:06:43 -03:00
|
|
|
|
self.assertEqual(b_escaped, b)
|
2011-03-25 09:09:33 -03:00
|
|
|
|
self.assertMatch(b_escaped, b)
|
|
|
|
|
res = re.findall(re.escape('\u2620'.encode('utf-8')), b)
|
|
|
|
|
self.assertEqual(len(res), 2)
|
2008-09-10 14:44:35 -03:00
|
|
|
|
|
2014-09-15 05:33:19 -03:00
|
|
|
|
def test_pickling(self):
|
|
|
|
|
import pickle
|
|
|
|
|
oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)', re.UNICODE)
|
|
|
|
|
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
|
|
|
|
|
pickled = pickle.dumps(oldpat, proto)
|
|
|
|
|
newpat = pickle.loads(pickled)
|
|
|
|
|
self.assertEqual(newpat, oldpat)
|
|
|
|
|
# current pickle expects the _compile() reconstructor in re module
|
|
|
|
|
from re import _compile
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2017-04-16 04:16:03 -03:00
|
|
|
|
def test_copying(self):
|
|
|
|
|
import copy
|
|
|
|
|
p = re.compile(r'(?P<int>\d+)(?:\.(?P<frac>\d*))?')
|
|
|
|
|
self.assertIs(copy.copy(p), p)
|
|
|
|
|
self.assertIs(copy.deepcopy(p), p)
|
|
|
|
|
m = p.match('12.34')
|
|
|
|
|
self.assertIs(copy.copy(m), m)
|
|
|
|
|
self.assertIs(copy.deepcopy(m), m)
|
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
def test_constants(self):
|
|
|
|
|
self.assertEqual(re.I, re.IGNORECASE)
|
|
|
|
|
self.assertEqual(re.L, re.LOCALE)
|
|
|
|
|
self.assertEqual(re.M, re.MULTILINE)
|
|
|
|
|
self.assertEqual(re.S, re.DOTALL)
|
|
|
|
|
self.assertEqual(re.X, re.VERBOSE)
|
|
|
|
|
|
|
|
|
|
def test_flags(self):
|
2014-12-01 05:50:07 -04:00
|
|
|
|
for flag in [re.I, re.M, re.X, re.S, re.A, re.U]:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.compile('^pattern$', flag))
|
2014-12-01 05:50:07 -04:00
|
|
|
|
for flag in [re.I, re.M, re.X, re.S, re.A, re.L]:
|
|
|
|
|
self.assertTrue(re.compile(b'^pattern$', flag))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2003-04-25 11:12:40 -03:00
|
|
|
|
def test_sre_character_literals(self):
|
2012-06-23 08:29:19 -03:00
|
|
|
|
for i in [0, 8, 16, 32, 64, 127, 128, 255, 256, 0xFFFF, 0x10000, 0x10FFFF]:
|
|
|
|
|
if i < 256:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match(r"\%03o" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"\%03o0" % i, chr(i)+"0"))
|
|
|
|
|
self.assertTrue(re.match(r"\%03o8" % i, chr(i)+"8"))
|
|
|
|
|
self.assertTrue(re.match(r"\x%02x" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"\x%02x0" % i, chr(i)+"0"))
|
|
|
|
|
self.assertTrue(re.match(r"\x%02xz" % i, chr(i)+"z"))
|
2012-06-23 08:29:19 -03:00
|
|
|
|
if i < 0x10000:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match(r"\u%04x" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"\u%04x0" % i, chr(i)+"0"))
|
|
|
|
|
self.assertTrue(re.match(r"\u%04xz" % i, chr(i)+"z"))
|
|
|
|
|
self.assertTrue(re.match(r"\U%08x" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"\U%08x0" % i, chr(i)+"0"))
|
|
|
|
|
self.assertTrue(re.match(r"\U%08xz" % i, chr(i)+"z"))
|
|
|
|
|
self.assertTrue(re.match(r"\0", "\000"))
|
|
|
|
|
self.assertTrue(re.match(r"\08", "\0008"))
|
|
|
|
|
self.assertTrue(re.match(r"\01", "\001"))
|
|
|
|
|
self.assertTrue(re.match(r"\018", "\0018"))
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r"\567",
|
|
|
|
|
r'octal escape value \567 outside of '
|
|
|
|
|
r'range 0-0o377', 0)
|
2016-10-23 06:11:19 -03:00
|
|
|
|
self.checkPatternError(r"\911", 'invalid group reference 91', 1)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r"\x1", r'incomplete escape \x1', 0)
|
|
|
|
|
self.checkPatternError(r"\x1z", r'incomplete escape \x1', 0)
|
|
|
|
|
self.checkPatternError(r"\u123", r'incomplete escape \u123', 0)
|
|
|
|
|
self.checkPatternError(r"\u123z", r'incomplete escape \u123', 0)
|
|
|
|
|
self.checkPatternError(r"\U0001234", r'incomplete escape \U0001234', 0)
|
|
|
|
|
self.checkPatternError(r"\U0001234z", r'incomplete escape \U0001234', 0)
|
|
|
|
|
self.checkPatternError(r"\U00110000", r'bad escape \U00110000', 0)
|
2003-04-25 11:12:40 -03:00
|
|
|
|
|
2004-09-03 14:06:10 -03:00
|
|
|
|
def test_sre_character_class_literals(self):
|
2012-06-23 08:29:19 -03:00
|
|
|
|
for i in [0, 8, 16, 32, 64, 127, 128, 255, 256, 0xFFFF, 0x10000, 0x10FFFF]:
|
|
|
|
|
if i < 256:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match(r"[\%o]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\%o8]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\%03o]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\%03o0]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\%03o8]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\x%02x]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\x%02x0]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\x%02xz]" % i, chr(i)))
|
2012-06-23 08:29:19 -03:00
|
|
|
|
if i < 0x10000:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match(r"[\u%04x]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\u%04x0]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\u%04xz]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\U%08x]" % i, chr(i)))
|
|
|
|
|
self.assertTrue(re.match(r"[\U%08x0]" % i, chr(i)+"0"))
|
|
|
|
|
self.assertTrue(re.match(r"[\U%08xz]" % i, chr(i)+"z"))
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r"[\567]",
|
|
|
|
|
r'octal escape value \567 outside of '
|
|
|
|
|
r'range 0-0o377', 1)
|
|
|
|
|
self.checkPatternError(r"[\911]", r'bad escape \9', 1)
|
|
|
|
|
self.checkPatternError(r"[\x1z]", r'incomplete escape \x1', 1)
|
|
|
|
|
self.checkPatternError(r"[\u123z]", r'incomplete escape \u123', 1)
|
|
|
|
|
self.checkPatternError(r"[\U0001234z]", r'incomplete escape \U0001234', 1)
|
|
|
|
|
self.checkPatternError(r"[\U00110000]", r'bad escape \U00110000', 1)
|
2014-09-23 17:22:41 -03:00
|
|
|
|
self.assertTrue(re.match(r"[\U0001d49c-\U0001d4b5]", "\U0001d49e"))
|
2012-06-23 08:29:19 -03:00
|
|
|
|
|
|
|
|
|
def test_sre_byte_literals(self):
|
|
|
|
|
for i in [0, 8, 16, 32, 64, 127, 128, 255]:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match((r"\%03o" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"\%03o0" % i).encode(), bytes([i])+b"0"))
|
|
|
|
|
self.assertTrue(re.match((r"\%03o8" % i).encode(), bytes([i])+b"8"))
|
|
|
|
|
self.assertTrue(re.match((r"\x%02x" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"\x%02x0" % i).encode(), bytes([i])+b"0"))
|
|
|
|
|
self.assertTrue(re.match((r"\x%02xz" % i).encode(), bytes([i])+b"z"))
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, br"\u1234")
|
|
|
|
|
self.assertRaises(re.error, re.compile, br"\U00012345")
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match(br"\0", b"\000"))
|
|
|
|
|
self.assertTrue(re.match(br"\08", b"\0008"))
|
|
|
|
|
self.assertTrue(re.match(br"\01", b"\001"))
|
|
|
|
|
self.assertTrue(re.match(br"\018", b"\0018"))
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(br"\567",
|
|
|
|
|
r'octal escape value \567 outside of '
|
|
|
|
|
r'range 0-0o377', 0)
|
2016-10-23 06:11:19 -03:00
|
|
|
|
self.checkPatternError(br"\911", 'invalid group reference 91', 1)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(br"\x1", r'incomplete escape \x1', 0)
|
|
|
|
|
self.checkPatternError(br"\x1z", r'incomplete escape \x1', 0)
|
2012-06-23 08:29:19 -03:00
|
|
|
|
|
|
|
|
|
def test_sre_byte_class_literals(self):
|
2004-09-03 14:06:10 -03:00
|
|
|
|
for i in [0, 8, 16, 32, 64, 127, 128, 255]:
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.match((r"[\%o]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\%o8]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\%03o]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\%03o0]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\%03o8]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\x%02x]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\x%02x0]" % i).encode(), bytes([i])))
|
|
|
|
|
self.assertTrue(re.match((r"[\x%02xz]" % i).encode(), bytes([i])))
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, br"[\u1234]")
|
|
|
|
|
self.assertRaises(re.error, re.compile, br"[\U00012345]")
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(br"[\567]",
|
|
|
|
|
r'octal escape value \567 outside of '
|
|
|
|
|
r'range 0-0o377', 1)
|
|
|
|
|
self.checkPatternError(br"[\911]", r'bad escape \9', 1)
|
|
|
|
|
self.checkPatternError(br"[\x1z]", r'incomplete escape \x1', 1)
|
|
|
|
|
|
|
|
|
|
def test_character_set_errors(self):
|
|
|
|
|
self.checkPatternError(r'[', 'unterminated character set', 0)
|
|
|
|
|
self.checkPatternError(r'[^', 'unterminated character set', 0)
|
|
|
|
|
self.checkPatternError(r'[a', 'unterminated character set', 0)
|
|
|
|
|
# bug 545855 -- This pattern failed to cause a compile error as it
|
|
|
|
|
# should, instead provoking a TypeError.
|
|
|
|
|
self.checkPatternError(r"[a-", 'unterminated character set', 0)
|
|
|
|
|
self.checkPatternError(r"[\w-b]", r'bad character range \w-b', 1)
|
|
|
|
|
self.checkPatternError(r"[a-\w]", r'bad character range a-\w', 1)
|
|
|
|
|
self.checkPatternError(r"[b-a]", 'bad character range b-a', 1)
|
2004-09-03 14:06:10 -03:00
|
|
|
|
|
2003-04-25 11:12:40 -03:00
|
|
|
|
def test_bug_113254(self):
|
|
|
|
|
self.assertEqual(re.match(r'(a)|(b)', 'b').start(1), -1)
|
|
|
|
|
self.assertEqual(re.match(r'(a)|(b)', 'b').end(1), -1)
|
|
|
|
|
self.assertEqual(re.match(r'(a)|(b)', 'b').span(1), (-1, -1))
|
|
|
|
|
|
2003-04-25 11:31:54 -03:00
|
|
|
|
def test_bug_527371(self):
|
|
|
|
|
# bug described in patches 527371/672491
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.match(r'(a)?a','a').lastindex)
|
2003-04-25 11:31:54 -03:00
|
|
|
|
self.assertEqual(re.match(r'(a)(b)?b','ab').lastindex, 1)
|
|
|
|
|
self.assertEqual(re.match(r'(?P<a>a)(?P<b>b)?b','ab').lastgroup, 'a')
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r"(?P<a>a(b))", "ab").lastgroup, 'a')
|
|
|
|
|
self.assertEqual(re.match(r"((a))", "a").lastindex, 1)
|
2003-04-25 11:31:54 -03:00
|
|
|
|
|
|
|
|
|
def test_bug_418626(self):
|
|
|
|
|
# bugs 418626 at al. -- Testing Greg Chapman's addition of op code
|
|
|
|
|
# SRE_OP_MIN_REPEAT_ONE for eliminating recursion on simple uses of
|
|
|
|
|
# pattern '*?' on a long string.
|
|
|
|
|
self.assertEqual(re.match('.*?c', 10000*'ab'+'cd').end(0), 20001)
|
|
|
|
|
self.assertEqual(re.match('.*?cd', 5000*'ab'+'c'+5000*'ab'+'cde').end(0),
|
|
|
|
|
20003)
|
|
|
|
|
self.assertEqual(re.match('.*?cd', 20000*'abc'+'de').end(0), 60001)
|
2003-10-17 19:13:16 -03:00
|
|
|
|
# non-simple '*?' still used to hit the recursion limit, before the
|
2004-01-18 16:29:55 -04:00
|
|
|
|
# non-recursive scheme was implemented.
|
2003-10-17 19:13:16 -03:00
|
|
|
|
self.assertEqual(re.search('(a|b)*?c', 10000*'ab'+'cd').end(0), 20001)
|
2003-04-25 11:31:54 -03:00
|
|
|
|
|
|
|
|
|
def test_bug_612074(self):
|
2007-05-02 16:09:54 -03:00
|
|
|
|
pat="["+re.escape("\u2039")+"]"
|
2003-04-25 11:31:54 -03:00
|
|
|
|
self.assertEqual(re.compile(pat) and 1, 1)
|
|
|
|
|
|
2003-04-25 12:40:28 -03:00
|
|
|
|
def test_stack_overflow(self):
|
2003-10-17 19:13:16 -03:00
|
|
|
|
# nasty cases that used to overflow the straightforward recursive
|
2003-04-25 12:40:28 -03:00
|
|
|
|
# implementation of repeated groups.
|
2003-10-17 19:13:16 -03:00
|
|
|
|
self.assertEqual(re.match('(x)*', 50000*'x').group(1), 'x')
|
|
|
|
|
self.assertEqual(re.match('(x)*y', 50000*'x'+'y').group(1), 'x')
|
|
|
|
|
self.assertEqual(re.match('(x)*?y', 50000*'x'+'y').group(1), 'x')
|
2003-04-25 12:40:28 -03:00
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
def test_nothing_to_repeat(self):
|
|
|
|
|
for reps in '*', '+', '?', '{1,2}':
|
|
|
|
|
for mod in '', '?':
|
|
|
|
|
self.checkPatternError('%s%s' % (reps, mod),
|
|
|
|
|
'nothing to repeat', 0)
|
|
|
|
|
self.checkPatternError('(?:%s%s)' % (reps, mod),
|
|
|
|
|
'nothing to repeat', 3)
|
|
|
|
|
|
|
|
|
|
def test_multiple_repeat(self):
|
2022-03-21 13:28:22 -03:00
|
|
|
|
for outer_reps in '*', '+', '?', '{1,2}':
|
|
|
|
|
for outer_mod in '', '?', '+':
|
2015-03-25 16:03:47 -03:00
|
|
|
|
outer_op = outer_reps + outer_mod
|
|
|
|
|
for inner_reps in '*', '+', '?', '{1,2}':
|
2022-03-21 13:28:22 -03:00
|
|
|
|
for inner_mod in '', '?', '+':
|
|
|
|
|
if inner_mod + outer_reps in ('?', '+'):
|
|
|
|
|
continue
|
2015-03-25 16:03:47 -03:00
|
|
|
|
inner_op = inner_reps + inner_mod
|
|
|
|
|
self.checkPatternError(r'x%s%s' % (inner_op, outer_op),
|
|
|
|
|
'multiple repeat', 1 + len(inner_op))
|
|
|
|
|
|
2013-02-16 15:23:53 -04:00
|
|
|
|
def test_unlimited_zero_width_repeat(self):
|
|
|
|
|
# Issue #9669
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?)*y', 'z'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?)+y', 'z'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?){2,}y', 'z'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?)*?y', 'z'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?)+?y', 'z'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?:a?){2,}?y', 'z'))
|
|
|
|
|
|
2003-04-25 12:40:28 -03:00
|
|
|
|
def test_scanner(self):
|
|
|
|
|
def s_ident(scanner, token): return token
|
|
|
|
|
def s_operator(scanner, token): return "op%s" % token
|
|
|
|
|
def s_float(scanner, token): return float(token)
|
|
|
|
|
def s_int(scanner, token): return int(token)
|
|
|
|
|
|
|
|
|
|
scanner = Scanner([
|
|
|
|
|
(r"[a-zA-Z_]\w*", s_ident),
|
|
|
|
|
(r"\d+\.\d*", s_float),
|
|
|
|
|
(r"\d+", s_int),
|
|
|
|
|
(r"=|\+|-|\*|/", s_operator),
|
|
|
|
|
(r"\s+", None),
|
|
|
|
|
])
|
|
|
|
|
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(scanner.scanner.scanner("").pattern)
|
2003-06-19 21:25:14 -03:00
|
|
|
|
|
2003-04-25 12:40:28 -03:00
|
|
|
|
self.assertEqual(scanner.scan("sum = 3*foo + 312.50 + bar"),
|
|
|
|
|
(['sum', 'op=', 3, 'op*', 'foo', 'op+', 312.5,
|
|
|
|
|
'op+', 'bar'], ''))
|
|
|
|
|
|
2003-04-25 13:00:14 -03:00
|
|
|
|
def test_bug_448951(self):
|
|
|
|
|
# bug 448951 (similar to 429357, but with single char match)
|
|
|
|
|
# (Also test greedy matches.)
|
|
|
|
|
for op in '','?','*':
|
|
|
|
|
self.assertEqual(re.match(r'((.%s):)?z'%op, 'z').groups(),
|
|
|
|
|
(None, None))
|
|
|
|
|
self.assertEqual(re.match(r'((.%s):)?z'%op, 'a:z').groups(),
|
|
|
|
|
('a:', 'a'))
|
|
|
|
|
|
2003-04-27 09:34:14 -03:00
|
|
|
|
def test_bug_725106(self):
|
|
|
|
|
# capturing groups in alternatives in repeats
|
|
|
|
|
self.assertEqual(re.match('^((a)|b)*', 'abc').groups(),
|
|
|
|
|
('b', 'a'))
|
|
|
|
|
self.assertEqual(re.match('^(([ab])|c)*', 'abc').groups(),
|
|
|
|
|
('c', 'b'))
|
|
|
|
|
self.assertEqual(re.match('^((d)|[ab])*', 'abc').groups(),
|
|
|
|
|
('b', None))
|
|
|
|
|
self.assertEqual(re.match('^((a)c|[ab])*', 'abc').groups(),
|
|
|
|
|
('b', None))
|
|
|
|
|
self.assertEqual(re.match('^((a)|b)*?c', 'abc').groups(),
|
|
|
|
|
('b', 'a'))
|
|
|
|
|
self.assertEqual(re.match('^(([ab])|c)*?d', 'abcd').groups(),
|
|
|
|
|
('c', 'b'))
|
|
|
|
|
self.assertEqual(re.match('^((d)|[ab])*?c', 'abc').groups(),
|
|
|
|
|
('b', None))
|
|
|
|
|
self.assertEqual(re.match('^((a)c|[ab])*?c', 'abc').groups(),
|
|
|
|
|
('b', None))
|
|
|
|
|
|
Fix for part of the problem mentioned in #725149 by Greg Chapman.
This problem is related to a wrong behavior from mark_save/restore(),
which don't restore the mark_stack_base before restoring the marks.
Greg's suggestion was to change the asserts, which happen to be
the only recursive ops that can continue the loop, but the problem would
happen to any operation with the same behavior. So, rather than
hardcoding this into asserts, I have changed mark_save/restore() to
always restore the stackbase before restoring the marks.
Both solutions should fix these two cases, presented by Greg:
>>> re.match('(a)(?:(?=(b)*)c)*', 'abb').groups()
('b', None)
>>> re.match('(a)((?!(b)*))*', 'abb').groups()
('b', None, None)
The rest of the bug and patch in #725149 must be discussed further.
2003-04-27 10:25:21 -03:00
|
|
|
|
def test_bug_725149(self):
|
|
|
|
|
# mark_stack_base restoring before restoring marks
|
|
|
|
|
self.assertEqual(re.match('(a)(?:(?=(b)*)c)*', 'abb').groups(),
|
|
|
|
|
('a', None))
|
|
|
|
|
self.assertEqual(re.match('(a)((?!(b)*))*', 'abb').groups(),
|
|
|
|
|
('a', None, None))
|
|
|
|
|
|
2003-07-02 17:03:04 -03:00
|
|
|
|
def test_bug_764548(self):
|
|
|
|
|
# bug 764548, re.compile() barfs on str/unicode subclasses
|
2007-05-02 16:09:54 -03:00
|
|
|
|
class my_unicode(str): pass
|
2003-07-02 17:03:04 -03:00
|
|
|
|
pat = re.compile(my_unicode("abc"))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match("xyz"))
|
2003-07-02 17:03:04 -03:00
|
|
|
|
|
2003-04-25 13:00:14 -03:00
|
|
|
|
def test_finditer(self):
|
|
|
|
|
iter = re.finditer(r":+", "a:b::c:::d")
|
|
|
|
|
self.assertEqual([item.group(0) for item in iter],
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
|
2012-03-12 21:22:38 -03:00
|
|
|
|
pat = re.compile(r":+")
|
|
|
|
|
iter = pat.finditer("a:b::c:::d", 1, 10)
|
|
|
|
|
self.assertEqual([item.group(0) for item in iter],
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
|
|
|
|
|
pat = re.compile(r":+")
|
|
|
|
|
iter = pat.finditer("a:b::c:::d", pos=1, endpos=10)
|
|
|
|
|
self.assertEqual([item.group(0) for item in iter],
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
|
|
|
|
|
pat = re.compile(r":+")
|
|
|
|
|
iter = pat.finditer("a:b::c:::d", endpos=10, pos=1)
|
|
|
|
|
self.assertEqual([item.group(0) for item in iter],
|
|
|
|
|
[":", "::", ":::"])
|
|
|
|
|
|
|
|
|
|
pat = re.compile(r":+")
|
|
|
|
|
iter = pat.finditer("a:b::c:::d", pos=3, endpos=8)
|
|
|
|
|
self.assertEqual([item.group(0) for item in iter],
|
|
|
|
|
["::", "::"])
|
|
|
|
|
|
2008-03-18 17:19:54 -03:00
|
|
|
|
def test_bug_926075(self):
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNot(re.compile('bug_926075'),
|
|
|
|
|
re.compile(b'bug_926075'))
|
2004-04-20 18:30:07 -03:00
|
|
|
|
|
2004-05-07 04:18:13 -03:00
|
|
|
|
def test_bug_931848(self):
|
2014-09-14 09:56:27 -03:00
|
|
|
|
pattern = "[\u002E\u3002\uFF0E\uFF61]"
|
2004-05-07 04:18:13 -03:00
|
|
|
|
self.assertEqual(re.compile(pattern).split("a.b.c"),
|
|
|
|
|
['a','b','c'])
|
|
|
|
|
|
2004-09-03 15:11:59 -03:00
|
|
|
|
def test_bug_581080(self):
|
|
|
|
|
iter = re.finditer(r"\s", "a b")
|
2007-04-21 12:47:16 -03:00
|
|
|
|
self.assertEqual(next(iter).span(), (1,2))
|
|
|
|
|
self.assertRaises(StopIteration, next, iter)
|
2004-09-03 15:11:59 -03:00
|
|
|
|
|
|
|
|
|
scanner = re.compile(r"\s").scanner("a b")
|
|
|
|
|
self.assertEqual(scanner.search().span(), (1, 2))
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(scanner.search())
|
2004-09-03 15:11:59 -03:00
|
|
|
|
|
|
|
|
|
def test_bug_817234(self):
|
|
|
|
|
iter = re.finditer(r".*", "asdf")
|
2007-04-21 12:47:16 -03:00
|
|
|
|
self.assertEqual(next(iter).span(), (0, 4))
|
|
|
|
|
self.assertEqual(next(iter).span(), (4, 4))
|
|
|
|
|
self.assertRaises(StopIteration, next, iter)
|
2004-09-03 15:11:59 -03:00
|
|
|
|
|
2009-07-28 14:22:36 -03:00
|
|
|
|
def test_bug_6561(self):
|
|
|
|
|
# '\d' should match characters in Unicode category 'Nd'
|
|
|
|
|
# (Number, Decimal Digit), but not those in 'Nl' (Number,
|
|
|
|
|
# Letter) or 'No' (Number, Other).
|
|
|
|
|
decimal_digits = [
|
|
|
|
|
'\u0037', # '\N{DIGIT SEVEN}', category 'Nd'
|
|
|
|
|
'\u0e58', # '\N{THAI DIGIT SIX}', category 'Nd'
|
|
|
|
|
'\uff10', # '\N{FULLWIDTH DIGIT ZERO}', category 'Nd'
|
|
|
|
|
]
|
|
|
|
|
for x in decimal_digits:
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertEqual(re.match(r'^\d$', x).group(0), x)
|
2009-07-28 14:22:36 -03:00
|
|
|
|
|
|
|
|
|
not_decimal_digits = [
|
|
|
|
|
'\u2165', # '\N{ROMAN NUMERAL SIX}', category 'Nl'
|
|
|
|
|
'\u3039', # '\N{HANGZHOU NUMERAL TWENTY}', category 'Nl'
|
|
|
|
|
'\u2082', # '\N{SUBSCRIPT TWO}', category 'No'
|
|
|
|
|
'\u32b4', # '\N{CIRCLED NUMBER THIRTY NINE}', category 'No'
|
|
|
|
|
]
|
|
|
|
|
for x in not_decimal_digits:
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertIsNone(re.match(r'^\d$', x))
|
2009-07-28 14:22:36 -03:00
|
|
|
|
|
2023-06-11 06:17:35 -03:00
|
|
|
|
@warnings_helper.ignore_warnings(category=DeprecationWarning) # gh-80480 array('u')
|
Merged revisions 53952-54987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
Do not copy free variables to locals in class namespaces.
Fixes bug 1569356, but at the cost of a minor incompatibility in
locals(). Add test that verifies that the class namespace is not
polluted. Also clarify the behavior in the library docs.
Along the way, cleaned up the dict_to_map and map_to_dict
implementations and added some comments that explain what they do.
........
r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
Fix assertion.
........
r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
........
r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
Markup fix
........
r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions
are gone.
........
r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
Add some items
........
r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
Fix long-standing bug in name mangling for package imports
Reported by Mike Verdone.
........
r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
tabify
........
r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
tabify
Note that ast.c still has a mix of tabs and spaces, because it
attempts to use four-space indents for more of the new code.
........
r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
whitespace normalization
........
r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
Add checking for a number of metaclass error conditions.
We add some new rules that are required for preserving internal
invariants of types.
1. If type (or a subclass of type) appears in bases, it must appear
before any non-type bases. If a non-type base (like a regular
new-style class) occurred first, it could trick type into
allocating the new class an __dict__ which must be impossible.
2. There are several checks that are made of bases when creating a
type. Those checks are now repeated when assigning to __bases__.
We also add the restriction that assignment to __bases__ may not
change the metaclass of the type.
Add new tests for these cases and for a few other oddball errors that
were no previously tested. Remove a crasher test that was fixed.
Also some internal refactoring: Extract the code to find the most
derived metaclass of a type and its bases. It is now needed in two
places. Rewrite the TypeError checks in test_descr to use doctest.
The tests now clearly show what exception they expect to see.
........
r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
Add news about changes to metaclasses and __bases__ error checking.
........
r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
Modify the segfaulting example to show why r53997 is not a solution to
it.
........
r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
Add a test for instantiating SyntaxError with no arguments.
........
r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
Docstring nit.
........
r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
Prepare collections module for pure python code entries.
........
r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
Add collections.NamedTuple
........
r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
Add Pat and Eric for work on PEP 3101 in the sandbox
........
r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
Add NamedTuple
........
r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
Bug #1628895: some better tries to find HTML documentation in pydoc.
........
r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
Fix embarrassing typo and fix constantification of None
........
r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
note MacPorts/BerkDB change in setup.py
........
r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
Added Pete for 3101 too
........
r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
Minor corrections to docs, and an explanation comentary
........
r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
Patch #1674228: when assigning a slice (old-style), check for the
sq_ass_slice instead of the sq_slice slot.
........
r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1671450: add a section about subclassing builtin types to the
"extending and embedding" tutorial.
........
r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1121142: Implement ZipFile.open.
........
r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the fix in #1674228.
........
r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1672481: fix bug in idlelib.MultiCall.
........
r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
Bug #1674503: close the file opened by execfile() in an error condition.
........
r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
Fix another reincarnation of bug #1576657 in defaultdict.
........
r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the defaultdict KeyError bug.
........
r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1663234: you can now run doctest on test files and modules
using "python -m doctest [-v] filename ...".
........
r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #912410: Replace HTML entity references for attribute values
in HTMLParser.
........
r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
patch 1673619 - identify extension modules which cannot be built
........
r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
Patch #1646728: datetime.fromtimestamp fails with negative
fractional times. With unittest.
Somebody please backport to 2.5.
........
r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
Fix cmp vs. key argument for list.sort.
........
r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
Small nit, found by Neal.
........
r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1602128: clarify that richcmp methods can return NotImplemented
and should return True or False otherwise.
........
r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1673121: update README wrt. OSX default shell.
........
r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1654417: make operator.{get,set,del}slice use the full range
of Py_ssize_t.
........
r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch for bug #1633621: if curses.resizeterm() or
curses.resize_term() is called, update _curses.LINES,
_curses.COLS, curses.LINES and curses.COLS.
........
r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Document change to curses.
........
r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
Variant of patch #697613: don't exit the interpreter on a SystemExit
exception if the -i command line option or PYTHONINSPECT environment
variable is given, but break into the interactive interpreter just like
on other exceptions or normal program exit.
(backport)
........
r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch #703779: unset __file__ in __main__ after running a file. This
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
........
r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
add versionadded info
........
r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #1001604: glob.glob() now returns unicode filenames if it was
given a unicode argument and os.listdir() returns unicode filenames.
........
r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
Patches #1550273, #1550272: fix a few bugs in unittest and add a
comprehensive test suite for the module.
........
r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #787789: allow to pass custom TestRunner instances to unittest's
main() function.
........
r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1675471: convert test_pty to unittest.
........
r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
Add some sanity checks to unittest.TestSuite's addTest(s) methods.
Fixes #878275.
........
r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
Windows doesn't support negative timestamps. Skip the tests involving them
if os.name == "nt".
........
r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
Add missing ) in parenthical remark.
........
r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
Fix #1676656: \em is different from \emph...
........
r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
Add a NEWS entry for rev. 54207,8.
........
r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
SF 1676321: empty() returned wrong result
........
r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
SF #1637850: make_table in difflib did not work with unicode
........
r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1668482: don't use '-' in mkstemp
........
r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the
expected exception and attributes to be raised if the resource is not available
prevents overly broad catching of exceptions.
This is meant to help suppress spurious failures by raising
test.test_support.ResourceDenied if the exception matches. It would probably
be good to go through the various network tests and surround the calls to catch
connection timeouts (as done with test_socket_ssl in this commit).
........
r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
Add NEWS item for patch #1481079 (r54234).
........
r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
Fix SF #1676971, Complex OverflowError has a typo
........
r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
Typo.
........
r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #957003: Implement smtplib.LMTP.
........
r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
returned string up to the first NUL character.
........
r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
Add Ziga Seilnacht.
........
r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
Bug #1651235: When a tuple was passed to a ctypes function call,
Python would crash instead of raising an error.
The crash was caused by a section of code that should have been
removed long ago, at that time ctypes had other ways to pass
parameters to function calls.
........
r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
Hashing simplification pointed out by Thomas Wouters.
........
r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
* Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
* Drop safe_remove() in favor of test_support.unlink().
* Fix the indentation of test_samefile so that it runs.
........
r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
Will backport.
........
r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
Simplify a little by handling the TCP case first.
Update to use predominant style of spaces around = in args list
and print to stderr if debugging.
........
r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
Add proper attribution for a bug fix.
........
r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
Typos.
........
r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
Convert an assert to a raise so it works even in the presence of -O.
........
r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
Add missing "return" statements in exception handler.
........
r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1675981: remove unreachable code from type.__new__() method.
__dict__ and __weakref__ are removed from the slots tuple earlier
in the code, in the loop that mangles slot names. Will backport.
........
r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Will backport.
........
r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
Fix resource leak reported in SF #1516995.
........
r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
stable FTP.
Will backport.
........
r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
display name of an email address, e.g.
Foo
\tBar <foo@example.com>
Test case added by Barry.
........
r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
Sane humans would call these invalid tests, but Andrew McNamara pointed out
that given the inputs in these tests Excel does indeed produce the output
these tests expect. Document that for future confused folks.
........
r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
Patch #1677862: Require a space or tab after import in .pth files.
........
r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
Backport from Py3k branch:
Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
Had to change a few bits of the patch because classobjs and __methods__ are still
in Py2.6.
........
r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #1678647: write a newline after printing an exception in any
case, even when converting the value to a string failed.
........
r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
........
r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
Typo fix.
........
r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
Whitespace normalization.
........
r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
Add test.test_support.transient_internet . Returns a context manager that
nests test.test_support.TransientResource context managers that capture
exceptions raised when the Internet connection is flaky.
Initially using in test_socket_ssl but should probably be expanded to cover any
test that should not raise the captured exceptions if the Internet connection
works.
........
r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
Fix a typo where the variable name was not updated.
........
r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
Add some other acks for recent checkins:
Brian Leair - 922167
Tomer Filiba - 1591665
Jeremy Jones - 1192590
........
r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
Fix some style nits:
* lines too long
* wrong indentation
* space after a function name
* wrong function name in error string
* simplifying some logic
Also add an error check to PyDict_SetItemString.
........
r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
Typo and grammar fixes.
........
r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1679379: add documentation for fnmatch.translate().
........
r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1642844: comments to clarify the complexobject constructor.
........
r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1668100: urllib2 now correctly raises URLError instead of
OSError if accessing a local file via the file:// protocol fails.
........
r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1635454: the csv.DictWriter class now includes the offending
field names in its exception message if you try to write a record with
a dictionary containing fields not in the CSV field names list.
........
r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1555098: use str.join() instead of repeated string
concatenation in robotparser.
........
r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
pydoc's help keywords.
........
r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
........
r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1449244: Support Unicode strings in
email.message.Message.{set_charset,get_content_charset}.
Will backport.
........
r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
This is the implementation of POSIX.1-2001 (pax) format read/write
support.
The TarInfo class now contains all necessary logic to process and
create tar header data which has been moved there from the TarFile
class. The fromtarfile() method was added. The new path and linkpath
properties are aliases for the name and linkname attributes in
correspondence to the pax naming scheme.
The TarFile constructor and classmethods now accept a number of
keyword arguments which could only be set as attributes before (e.g.
dereference, ignore_zeros). The encoding and pax_headers arguments
were added for pax support. There is a new tarinfo keyword argument
that allows using subclassed TarInfo objects in TarFile.
The boolean TarFile.posix attribute is deprecated, because now three
tar formats are supported. Instead, the desired format for writing is
specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
as the format keyword argument. This change affects TarInfo.tobuf()
as well.
The test suite has been heavily reorganized and partially rewritten.
A new testtar.tar was added that contains sample data in many formats
from 4 different tar programs.
Some bugs and quirks that also have been fixed:
Directory names do no longer have a trailing slash in TarInfo.name or
TarFile.getnames().
Adding the same file twice does not create a hardlink file member.
The TarFile constructor does no longer need a name argument.
The TarFile._mode attribute was renamed to mode and contains either
'r', 'w' or 'a'.
........
r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
Bug #1622896: fix a rare corner case where the bz2 module raised an
error in spite of a succesful compression.
........
r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
Quick fix for tests that fail on systems with an encoding other
than 'iso8859-1'.
........
r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1603688: ConfigParser.SafeConfigParser now checks values that
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
........
r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1581073: add a flag to textwrap that prevents the dropping of
whitespace while wrapping.
........
r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1605192: list allowed states in error messages for imaplib.
........
r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
which can be set to False to prevent the default delete-on-close
behavior.
........
r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
Add acks for recent patch checkins:
Arvin Schnell - 1668482
S?\195?\169bastien Martini - 1481079
Heiko Wundram - 1491866
Damon Kohler - 1545011
Peter Parente - 1599845
Bjorn Lindqvist - 1678662
........
r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
Acks for recent patches.
........
r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
Fix a tab.
........
r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1533909: the timeit module now accepts callables in addition to
strings for the code to time and the setup code. Also added two
convenience functions for instantiating a Timer and calling its methods.
........
r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1530482: add pydoc.render_doc() which returns the documentation
for a thing instead of paging it to stdout, which pydoc.doc() does.
........
r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1444529: the builtin compile() now accepts keyword arguments.
(backport)
........
r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
Add versionadded marker for ctypes.c_bool.
........
r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1393667: pdb now has a "run" command which restarts the debugged
Python program, optionally with different arguments.
........
r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
Deprecate commands.getstatus().
........
r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
NEWS entry for getstatus() deprecation.
........
r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1429539: pdb now correctly initializes the __main__ module for
the debugged script, which means that imports from __main__ work
correctly now.
........
r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #957650: "%var%" environment variable references are now properly
expanded in ntpath.expandvars(), also "~user" home directory references
are recognized and handled on Windows.
........
r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1194449: correctly detect unbound methods in pydoc.
........
r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if
they occur on a single line, as opposed to the previous behavior of
quoting dots if they are the second character of any line.
........
r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
Inline PyImport_GetModulesReloading().
........
r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
2047-like headers where there is no whitespace between encoded words. This
fix changes the matching regexp to include a trailing lookahead assertion that
the closing ?= must be followed by whitespace, newline, or end-of-string.
This also changes the regexp to add the MULTILINE flag.
........
r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
correct order and names of the less often used keyword parameters.
........
r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
items are all OS X special API specific since OS X is unixy enough for these modules
to be available out of the box.
........
r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
Bug #767111: fix long-standing bug in urllib which caused an
AttributeError instead of an IOError when the server's response didn't
contain a valid HTTP status line.
........
r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
name. Remove a reference leak that happened if the name could not be
converted to string. Will backport.
........
r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
Will backport.
........
r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
Note how test_socket_ssl has various exceptions that deal with a flaky Net
connection are silenced.
........
r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
Wrap a long line and fix a typo (is -> if)
........
r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1680978: consistently use "alive" instead of "active" in the
thread lib doc.
........
r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1681153: the wave module now closes a file object it opened if
initialization failed.
........
r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
the implementation for __reduce__ and __reduce_ex__ into two separate
functions. Fixes bug #931877. Will backport.
........
r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Will backport.
........
r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
Bug #1681228: the webbrowser module now correctly uses the default
GNOME or KDE browser, depending on whether there is a session of one
of those present. Also, it tries the Windows default browser before
trying Mozilla variants.
(backport)
........
r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
True (which is not the default), it visits symlinks pointing to
directories.
........
r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
Add \versionadded tag.
........
r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
RFE #1670167: fix in isinstance() docs.
........
r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
Patch #1623563: allow __class__ assignment for classes with __slots__.
The old and the new class are still required to have the same slot
names, but the order in which they are specified is not relevant.
........
r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Whitespace cleanup. Also remove the empty lines
from the previous check in.
........
r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Remove warning: funcion declaration isn't a prototype
........
r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
Clean up formatting of this file.
The file should now follow PEP 7, except that it uses 4 space indents
(in the style of Py3k). This particular code would be really hard to
read with the regular tab idents.
Other changes:
- reflow long lines
- change multi-line conditionals to have test at end of line
........
r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
Patch #1676994: Refactor test_popen2 to use unittest.
........
r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
Remove test/output/test_popen2 (missed in r54417).
........
r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
Patch 1339796: add a relpath() function to os.path.
........
r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
to complex using its __complex__() method before falling back to the
__float__() method. Therefore, the functions in the cmath module now
can operate on objects that define a __complex__() method.
(backport)
........
r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
move note to the correct section
........
r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1678339: test case for bug in difflib.
........
r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
Patch #1683328: fixes and enhancements for "unparse" demo.
........
r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
Add some doc that was left out from some change to platform.py
........
r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
Add a comment about 3k migration
........
r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
Get rid of deprecation warning when testing commands.getstatus()
........
r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
Try backing out 54407 to see if it corrects the problems on the Windows
buildbots. This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
........
r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
Try to be a little more resilient to errors. This might help the test
pass, but my guess is that it won't. I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
........
r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
Try to get test_urllib to pass on Windows by closing the file.
I'm guessing that's the problem. h.getfile() must be called *after*
h.getreply() and the fp can be None.
I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not. I don't
know if this needs to be backported (assuming it actually works).
........
r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
Fix for glob.py if filesystem encoding is None.
........
r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
Remove unused file spotted by Paul Hankin
........
r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
........
r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
New test for rev. 54407 which only uses directories under TESTFN.
........
r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
Patch #1684834: document some utility C API functions.
........
r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
Add comments on maintenance of this file
........
r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
Fix sentence, and fix typo in example
........
r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
Put code examples at left margin instead of indenting them
........
r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
Minor clarification, saying that blocking means no timeout (from bug #882297)
........
r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
Bug #1675967: re patterns pickled with older Python versions can
now be unpickled. Will backport.
........
r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
Add test and fix for fromkeys() optional argument.
........
r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
Bug #1685704: use -m switch in timeit docs.
........
r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
Back out "Patch #1643874: memory leak in ctypes fixed."
The code in this patch leaves no way to give up the ownership of a
BSTR instance.
........
r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
- Bug #1683368: The object.__init__() and object.__new__() methods are
now stricter in rejecting excess arguments. The only time when
either allows excess arguments is when it is not overridden and the
other one is. For backwards compatibility, when both are
overridden, it is a deprecation warning (for now; maybe a Py3k
warning later).
When merging this into 3.0, the warnings should become errors.
Note: without the change to string.py, lots of spurious warnings happen.
What's going on there?
........
r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
Add Mark Dickinson for SF # 1675423.
........
r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
Will backport.
........
r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Will backport.
........
r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
Add a type.__init__() method that enforces the same signature as
type.__new__(), and then calls object.__init__(cls), just to be anal.
This allows us to restore the code in string.py's _TemplateMetaclass
that called super(...).__init__(name, bases, dct), which I commented
out yesterday since it broke due to the stricter argument checking
added to object.__init__().
........
r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
Added a 'create_connect()' function to socket.py, which creates a
connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.
........
r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
Add note about type.__init__().
........
r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
Prevent creation (followed by a segfault) of array types when the size
overflows the valid Py_ssize_t range. Check return values of
PyMem_Malloc.
Will backport to release25-maint.
........
r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
........
r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
Make test_relpath() pass on Windows.
........
r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
Patch #1489771: update syntax rules in Python Reference Manual.
Python 2.5 added support for explicit relative import statements and
yield expressions, which were missing in the manual.
Also fix grammar productions that used the names from the Grammar file,
markup that broke the generated grammar.txt, and wrap some lines that
broke the pdf output. Will backport.
........
r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
Remove typo accent.
........
r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
Revert accidental change.
........
r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
Change the docs to no longer claim that unittest is preferred over doctest for
regression tests.
........
r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
Redone the tests, using the infrastructure already present
for threading and socket serving.
........
r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
Closing the HTTP connection after each test, and listening more.
........
r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
Added an optional timeout to FTP class. Also I started a test_ftplib.py
file to test the ftp lib (right now I included a basic test, the timeout
one, and nothing else).
........
r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
Some nits.
........
r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
Forgot to add the file before the previous commit, here go
the ftplib tests.
........
r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
Added an optional timeout to poplib.POP3. Also created a
test_poplib.py file with a basic test and the timeout
ones. Docs are also updated.
........
r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
The basic test cases of poplib.py.
........
r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
Bug 1688393. Adds a control of negative values in
socket.recvfrom, which caused an ugly crash.
........
r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
the test_smtplib.py file, with a basic test and the timeout
ones. Docs are updated too.
........
r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
Thanks to Jerry Seutter for all three patches.
........
r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
Make test_zipfile clean up its temporary files properly.
........
r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
These are actually methods.
........
r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
In Windows' time.clock(), when QueryPerformanceFrequency() fails,
the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
as for the POSIX implementation (thanks to #pypy).
........
r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
Added timout parameter to telnetlib.Telnet. Also created
test_telnetlib.py with a basic test and timeout ones.
Docs are also updated.
........
r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
........
r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
Bug #1688274: add documentation for C-level class objects.
........
r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
Bump the patch level version of distutils since there were a few bug fixes since
the 2.5.0 release.
........
r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Label name fix.
........
r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
Add item. (Oops, accidentally checked this in on my branch)
........
r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
repair string literal.
........
r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
Markup fix.
........
r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
Duplicate label fix.
........
r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
Typo fix.
........
r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
Fix method names. Will backport.
........
r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
........
r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
Shut up an occaisonal buildbot error due to test files being left around.
........
r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated. On Windows, this is a problem because the
path is limited to 4k. There's no benefit in adding a path multiple
times, so prevent that from occuring. We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
Will backport.
........
r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
time.strptime's caching of its locale object was being recreated when the
locale changed but not used during the function call it was recreated during.
The test in this checkin is untested (OS X does not have the proper locale
support for me to test), although the fix for the bug this deals with
was tested by the OP (#1290505). Once the buildbots verify the test at least
doesn't fail it becomes a backport candidate.
........
r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
Fix the test for recreating the locale cache object by not worrying about if
one of the test locales cannot be set.
........
r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix a lot of markup and meta-information glitches.
........
r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
Another fix.
........
r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Lots of explicit class names for method and member descs.
........
r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
Explicit class names.
........
r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
Some semantic fixes.
........
r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Remove bogus entry.
........
r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix the class name of strings.
........
r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
SF #1693079: Cannot save empty array in shelve
........
r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
Array module's buffer interface can now handle empty arrays.
........
r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.
........
r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
SF 1602378 Clarify docstrings for bisect
........
r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes
........
r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
- Fix an off-by-one bug in locale.strxfrm().
patch taken from http://bugs.debian.org/416934.
........
r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
Fix the strange case of
\begin{methoddesc}[NNTP]{...}
where
\ifx#1\@undefined ended up comparing N and N, therefore executing
the true part of the conditional, blowing up at \@undefined.
........
r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
Now using unittest for the tests infraestructure. Also split the
tests in those who need the network, and that who doesn't.
........
r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
........
r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
Document that CatchWarningTests is reused by test_structmembers.py.
........
r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
Add tests for the filename.
Test that the stacklevel is handled correctly.
........
r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
Added a SSL server to test_socket_ssl.py to be able to test
locally. Now, it checks if have openssl available and run
those specific tests (it starts openssl at the beggining of
all the tests and then kills it at the end).
........
r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
Implement a contextmanager test.test_support.catch_warning that can
be used to catch the last warning issued by the warning framework.
Change test_warnings.py and test_structmembers.py to use this
new contextmanager.
........
r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
Changed the whole structure of startup and checking if the
server is available. Hope to not get more false alarms.
........
r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
........
r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
Fix a race condition in this test -- instead of assuming that it will take
the test server thread at most 0.5 seconds to get ready, use an event
variable.
........
r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
Clean up imports.
........
r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
Stop using test_support.verify().
........
r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
Bug #1686475: Support stat'ing open files on Windows again.
Will backport to 2.5.
........
r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_getopt use unittest.
........
r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_softspace use unittest.
........
r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
Fix WalkTests.test_traversal() on Windows. The cleanup in
MakedirTests.setUp() can now be removed.
........
r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
Bug #1563759: struct.unpack doens't support buffer protocol objects
........
r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_long_future to use unittest.
........
r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_normalization to use unittest.
........
r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
Some grammar fixes
........
r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_stringprep to use unittest.
........
r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
Import cleanup in test_crypt.
........
r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_gc to use unittest.
........
r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_module to use unittest.
........
r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_fileinput to use unittest.
........
r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
Doc that file.next() has undefined behaviour when called on a file opened with
'w'. Closes bug #1569057.
To be backported once 2.5 branch is unfrozen.
........
r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
........
r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
Minor fix to the tests pass ok even with -O.
........
r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
Typo fix.
........
r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
General clean-up. Lot of margin corrections, comments, some typos.
Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.
........
r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
Point readers at the patch submission instructions
........
r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
Describe undocumented third argument to touchline()
........
r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
Add some missing NULL checks which trigger crashes on low-memory conditions.
Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1191699: Make slices picklable
........
r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
Exceptions are no longer old-style instances. Fix accordingly.
........
r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
Repair missing spaces after \UNIX.
........
r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1193128: Let str.translate(None) be an identity transformation
........
r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1698951: clarify deprecation message in rexec and Bastion
........
r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
........
r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
Port r54805 from python25-maint branch:
Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read. Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write. This will definitely happen on Mac OS X and could potentially
happen on other platforms. See the comment for details.
........
r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
Fix potential crash in path manipulation on windows
........
r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
is built before '_ctypes' is attempted.
Will backport to 2.5 once it is unfrozen for 2.5.1.
........
r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
........
r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
SF #1701207, Fix bogus assertion (and test it!)
........
r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
Check the availability of the urlfetch resource earlier than before.
........
r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
Add Travis Oliphant.
........
r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
Silence a compiler warning about incompatible pointer types.
........
r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
Revert r53997 as per
http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
I've kept a couple of still-valid extra tests in test_descr, but didn't
bother to sort through the new comments and refactorings added in r53997
to see if some of them could be kept. If so, they could go in a
follow-up check-in.
........
r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
Fix a usage of the dangerous pattern decref - modify field - incref.
........
r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
Add an optional address to copy the failure mails to.
Detect a conflict in the only file that should have outstanding changes
when this script is run. This doesn't matter on the trunk, but does
when run on a branch. Trunk always has the date set to today in
boilerplate.tex. Each time a release is cut with a different date,
a conflict occurs. (We could copy a known good version, but then
we would lose changes to this file.)
........
r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
Bug #1704790: bind name "sys" locally in __del__ method so that it is
not cleared before __del__ is run.
........
r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
Added tests for other methods of SSL object. Now we cover
all the object methods. This is the final step to close
the #451607 bug.
........
r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
As specified in RFC 2616, 2xx code indicates that the client's
request was successfully received, understood, and accepted.
Now in these cases no error is raised. Also fixed tests.
........
r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
Convert PyUnit -> unittest.
........
r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
Remove code that hasn't been called in years.
........
r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
Some new year updates.
........
r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
Added a comment about last change in urllib2.py (all 2xx responses
are ok now).
........
r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
Bug #1705717: error in sys.argv docs.
........
r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
........
r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
Fix markup
........
r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
Patch #1698768: updated the "using Python on the Mac" intro.
........
r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
Markup fix.
........
r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
Whitespace normalization. Ugh, we really need to do this more often.
You might want to review this change as it's my first time. Be gentle. :-)
........
r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
Change test_support.have_unicode to use True/False instead of 1/0.
........
r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
Whitespace normalization.
........
r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
Import and raise statement cleanup.
........
r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
Convert test_ossaudiodev to use unittest.
........
r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
Fix an issue related to the unittest conversion.
........
r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
fix some markup errors
........
r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build
........
r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
Minor wording change on slicing aide-memoire.
........
r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
Accomodate 64 bit time_t in the _bsddb module.
........
2007-04-27 16:54:29 -03:00
|
|
|
|
def test_empty_array(self):
|
|
|
|
|
# SF buf 1647541
|
|
|
|
|
import array
|
2023-06-11 06:17:35 -03:00
|
|
|
|
for typecode in 'bBhuwHiIlLfd':
|
Merged revisions 53952-54987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines
Do not copy free variables to locals in class namespaces.
Fixes bug 1569356, but at the cost of a minor incompatibility in
locals(). Add test that verifies that the class namespace is not
polluted. Also clarify the behavior in the library docs.
Along the way, cleaned up the dict_to_map and map_to_dict
implementations and added some comments that explain what they do.
........
r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines
Fix assertion.
........
r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines
When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
........
r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line
Markup fix
........
r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines
SF #1669182, 2.5 was already fixed. Just assert in 2.6 since string exceptions
are gone.
........
r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line
Add some items
........
r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines
Fix long-standing bug in name mangling for package imports
Reported by Mike Verdone.
........
r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines
tabify
........
r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines
tabify
Note that ast.c still has a mix of tabs and spaces, because it
attempts to use four-space indents for more of the new code.
........
r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines
whitespace normalization
........
r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines
Add checking for a number of metaclass error conditions.
We add some new rules that are required for preserving internal
invariants of types.
1. If type (or a subclass of type) appears in bases, it must appear
before any non-type bases. If a non-type base (like a regular
new-style class) occurred first, it could trick type into
allocating the new class an __dict__ which must be impossible.
2. There are several checks that are made of bases when creating a
type. Those checks are now repeated when assigning to __bases__.
We also add the restriction that assignment to __bases__ may not
change the metaclass of the type.
Add new tests for these cases and for a few other oddball errors that
were no previously tested. Remove a crasher test that was fixed.
Also some internal refactoring: Extract the code to find the most
derived metaclass of a type and its bases. It is now needed in two
places. Rewrite the TypeError checks in test_descr to use doctest.
The tests now clearly show what exception they expect to see.
........
r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines
Add news about changes to metaclasses and __bases__ error checking.
........
r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines
Modify the segfaulting example to show why r53997 is not a solution to
it.
........
r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines
Add a test for instantiating SyntaxError with no arguments.
........
r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line
Docstring nit.
........
r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line
Prepare collections module for pure python code entries.
........
r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line
Add collections.NamedTuple
........
r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line
Add Pat and Eric for work on PEP 3101 in the sandbox
........
r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line
Add NamedTuple
........
r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines
Bug #1628895: some better tries to find HTML documentation in pydoc.
........
r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line
Fix embarrassing typo and fix constantification of None
........
r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines
Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines
Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines
Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line
note MacPorts/BerkDB change in setup.py
........
r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line
Added Pete for 3101 too
........
r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line
Minor corrections to docs, and an explanation comentary
........
r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines
Patch #1674228: when assigning a slice (old-style), check for the
sq_ass_slice instead of the sq_slice slot.
........
r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines
Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1671450: add a section about subclassing builtin types to the
"extending and embedding" tutorial.
........
r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1121142: Implement ZipFile.open.
........
r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the fix in #1674228.
........
r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1672481: fix bug in idlelib.MultiCall.
........
r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line
Bug #1674503: close the file opened by execfile() in an error condition.
........
r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines
Fix another reincarnation of bug #1576657 in defaultdict.
........
r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines
A test case for the defaultdict KeyError bug.
........
r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1663234: you can now run doctest on test files and modules
using "python -m doctest [-v] filename ...".
........
r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #912410: Replace HTML entity references for attribute values
in HTMLParser.
........
r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line
patch 1673619 - identify extension modules which cannot be built
........
r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines
Patch #1646728: datetime.fromtimestamp fails with negative
fractional times. With unittest.
Somebody please backport to 2.5.
........
r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines
Fix cmp vs. key argument for list.sort.
........
r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines
Small nit, found by Neal.
........
r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1602128: clarify that richcmp methods can return NotImplemented
and should return True or False otherwise.
........
r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #1673121: update README wrt. OSX default shell.
........
r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines
Patch #1654417: make operator.{get,set,del}slice use the full range
of Py_ssize_t.
........
r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch for bug #1633621: if curses.resizeterm() or
curses.resize_term() is called, update _curses.LINES,
_curses.COLS, curses.LINES and curses.COLS.
........
r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines
Document change to curses.
........
r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines
Variant of patch #697613: don't exit the interpreter on a SystemExit
exception if the -i command line option or PYTHONINSPECT environment
variable is given, but break into the interactive interpreter just like
on other exceptions or normal program exit.
(backport)
........
r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines
Patch #703779: unset __file__ in __main__ after running a file. This
makes the filenames the warning module prints much more sensible when
a PYTHONSTARTUP file is used.
........
r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines
add versionadded info
........
r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines
Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #1001604: glob.glob() now returns unicode filenames if it was
given a unicode argument and os.listdir() returns unicode filenames.
........
r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines
Patches #1550273, #1550272: fix a few bugs in unittest and add a
comprehensive test suite for the module.
........
r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines
Patch #787789: allow to pass custom TestRunner instances to unittest's
main() function.
........
r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines
Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines
Patch #1675471: convert test_pty to unittest.
........
r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines
Add some sanity checks to unittest.TestSuite's addTest(s) methods.
Fixes #878275.
........
r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines
Windows doesn't support negative timestamps. Skip the tests involving them
if os.name == "nt".
........
r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines
Add missing ) in parenthical remark.
........
r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines
Fix #1676656: \em is different from \emph...
........
r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines
Add a NEWS entry for rev. 54207,8.
........
r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line
SF 1676321: empty() returned wrong result
........
r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line
Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line
SF #1637850: make_table in difflib did not work with unicode
........
r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1668482: don't use '-' in mkstemp
........
r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines
Introduce test.test_support.TransientResource. It's a context manager to
surround calls to resources that may or may not be available. Specifying the
expected exception and attributes to be raised if the resource is not available
prevents overly broad catching of exceptions.
This is meant to help suppress spurious failures by raising
test.test_support.ResourceDenied if the exception matches. It would probably
be good to go through the various network tests and surround the calls to catch
connection timeouts (as done with test_socket_ssl in this commit).
........
r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line
Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line
Add NEWS item for patch #1481079 (r54234).
........
r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line
Fix SF #1676971, Complex OverflowError has a typo
........
r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines
Typo.
........
r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #957003: Implement smtplib.LMTP.
........
r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines
Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines
Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
returned string up to the first NUL character.
........
r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines
Add Ziga Seilnacht.
........
r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines
Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines
Bug #1651235: When a tuple was passed to a ctypes function call,
Python would crash instead of raising an error.
The crash was caused by a section of code that should have been
removed long ago, at that time ctypes had other ways to pass
parameters to function calls.
........
r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line
Hashing simplification pointed out by Thomas Wouters.
........
r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines
* Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
* Drop safe_remove() in favor of test_support.unlink().
* Fix the indentation of test_samefile so that it runs.
........
r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines
Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
Will backport.
........
r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines
Simplify a little by handling the TCP case first.
Update to use predominant style of spaces around = in args list
and print to stderr if debugging.
........
r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line
Add proper attribution for a bug fix.
........
r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines
Typos.
........
r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line
Convert an assert to a raise so it works even in the presence of -O.
........
r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines
Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines
Add missing "return" statements in exception handler.
........
r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1675981: remove unreachable code from type.__new__() method.
__dict__ and __weakref__ are removed from the slots tuple earlier
in the code, in the loop that mangles slot names. Will backport.
........
r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines
Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
Will backport.
........
r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line
Fix resource leak reported in SF #1516995.
........
r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines
Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
stable FTP.
Will backport.
........
r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines
Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
display name of an email address, e.g.
Foo
\tBar <foo@example.com>
Test case added by Barry.
........
r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines
Sane humans would call these invalid tests, but Andrew McNamara pointed out
that given the inputs in these tests Excel does indeed produce the output
these tests expect. Document that for future confused folks.
........
r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines
Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines
Patch #1677862: Require a space or tab after import in .pth files.
........
r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines
Backport from Py3k branch:
Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.
Had to change a few bits of the patch because classobjs and __methods__ are still
in Py2.6.
........
r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #1678647: write a newline after printing an exception in any
case, even when converting the value to a string failed.
........
r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines
Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
Will backport.
........
r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines
Typo fix.
........
r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line
Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines
Whitespace normalization.
........
r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines
Add test.test_support.transient_internet . Returns a context manager that
nests test.test_support.TransientResource context managers that capture
exceptions raised when the Internet connection is flaky.
Initially using in test_socket_ssl but should probably be expanded to cover any
test that should not raise the captured exceptions if the Internet connection
works.
........
r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines
Fix a typo where the variable name was not updated.
........
r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line
Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines
Add some other acks for recent checkins:
Brian Leair - 922167
Tomer Filiba - 1591665
Jeremy Jones - 1192590
........
r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines
Fix some style nits:
* lines too long
* wrong indentation
* space after a function name
* wrong function name in error string
* simplifying some logic
Also add an error check to PyDict_SetItemString.
........
r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines
Typo and grammar fixes.
........
r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1679379: add documentation for fnmatch.translate().
........
r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1642844: comments to clarify the complexobject constructor.
........
r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1668100: urllib2 now correctly raises URLError instead of
OSError if accessing a local file via the file:// protocol fails.
........
r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1635454: the csv.DictWriter class now includes the offending
field names in its exception message if you try to write a record with
a dictionary containing fields not in the CSV field names list.
........
r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1555098: use str.join() instead of repeated string
concatenation in robotparser.
........
r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
pydoc's help keywords.
........
r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
........
r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1449244: Support Unicode strings in
email.message.Message.{set_charset,get_content_charset}.
Will backport.
........
r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines
This is the implementation of POSIX.1-2001 (pax) format read/write
support.
The TarInfo class now contains all necessary logic to process and
create tar header data which has been moved there from the TarFile
class. The fromtarfile() method was added. The new path and linkpath
properties are aliases for the name and linkname attributes in
correspondence to the pax naming scheme.
The TarFile constructor and classmethods now accept a number of
keyword arguments which could only be set as attributes before (e.g.
dereference, ignore_zeros). The encoding and pax_headers arguments
were added for pax support. There is a new tarinfo keyword argument
that allows using subclassed TarInfo objects in TarFile.
The boolean TarFile.posix attribute is deprecated, because now three
tar formats are supported. Instead, the desired format for writing is
specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
as the format keyword argument. This change affects TarInfo.tobuf()
as well.
The test suite has been heavily reorganized and partially rewritten.
A new testtar.tar was added that contains sample data in many formats
from 4 different tar programs.
Some bugs and quirks that also have been fixed:
Directory names do no longer have a trailing slash in TarInfo.name or
TarFile.getnames().
Adding the same file twice does not create a hardlink file member.
The TarFile constructor does no longer need a name argument.
The TarFile._mode attribute was renamed to mode and contains either
'r', 'w' or 'a'.
........
r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines
Bug #1622896: fix a rare corner case where the bz2 module raised an
error in spite of a succesful compression.
........
r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines
Quick fix for tests that fail on systems with an encoding other
than 'iso8859-1'.
........
r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1603688: ConfigParser.SafeConfigParser now checks values that
are set for invalid interpolation sequences that would lead to errors
on reading back those values.
........
r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1581073: add a flag to textwrap that prevents the dropping of
whitespace while wrapping.
........
r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1605192: list allowed states in error messages for imaplib.
........
r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
which can be set to False to prevent the default delete-on-close
behavior.
........
r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines
Add acks for recent patch checkins:
Arvin Schnell - 1668482
S?\195?\169bastien Martini - 1481079
Heiko Wundram - 1491866
Damon Kohler - 1545011
Peter Parente - 1599845
Bjorn Lindqvist - 1678662
........
r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines
Acks for recent patches.
........
r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines
Fix a tab.
........
r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1533909: the timeit module now accepts callables in addition to
strings for the code to time and the setup code. Also added two
convenience functions for instantiating a Timer and calling its methods.
........
r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1530482: add pydoc.render_doc() which returns the documentation
for a thing instead of paging it to stdout, which pydoc.doc() does.
........
r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line
Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1444529: the builtin compile() now accepts keyword arguments.
(backport)
........
r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line
Add versionadded marker for ctypes.c_bool.
........
r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines
Patch #1393667: pdb now has a "run" command which restarts the debugged
Python program, optionally with different arguments.
........
r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines
Deprecate commands.getstatus().
........
r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines
NEWS entry for getstatus() deprecation.
........
r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #1429539: pdb now correctly initializes the __main__ module for
the debugged script, which means that imports from __main__ work
correctly now.
........
r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines
Patch #957650: "%var%" environment variable references are now properly
expanded in ntpath.expandvars(), also "~user" home directory references
are recognized and handled on Windows.
........
r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines
Patch #1194449: correctly detect unbound methods in pydoc.
........
r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if
they occur on a single line, as opposed to the previous behavior of
quoting dots if they are the second character of any line.
........
r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line
Inline PyImport_GetModulesReloading().
........
r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines
SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
2047-like headers where there is no whitespace between encoded words. This
fix changes the matching regexp to include a trailing lookahead assertion that
the closing ?= must be followed by whitespace, newline, or end-of-string.
This also changes the regexp to add the MULTILINE flag.
........
r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines
correct order and names of the less often used keyword parameters.
........
r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines
Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
items are all OS X special API specific since OS X is unixy enough for these modules
to be available out of the box.
........
r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines
Bug #767111: fix long-standing bug in urllib which caused an
AttributeError instead of an IOError when the server's response didn't
contain a valid HTTP status line.
........
r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines
Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
name. Remove a reference leak that happened if the name could not be
converted to string. Will backport.
........
r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines
Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
Will backport.
........
r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines
Note how test_socket_ssl has various exceptions that deal with a flaky Net
connection are silenced.
........
r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines
Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line
Wrap a long line and fix a typo (is -> if)
........
r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1680978: consistently use "alive" instead of "active" in the
thread lib doc.
........
r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1681153: the wave module now closes a file object it opened if
initialization failed.
........
r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
the implementation for __reduce__ and __reduce_ex__ into two separate
functions. Fixes bug #931877. Will backport.
........
r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines
Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Will backport.
........
r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines
Bug #1681228: the webbrowser module now correctly uses the default
GNOME or KDE browser, depending on whether there is a session of one
of those present. Also, it tries the Windows default browser before
trying Mozilla variants.
(backport)
........
r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines
Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
True (which is not the default), it visits symlinks pointing to
directories.
........
r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines
Add \versionadded tag.
........
r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines
RFE #1670167: fix in isinstance() docs.
........
r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines
Patch #1623563: allow __class__ assignment for classes with __slots__.
The old and the new class are still required to have the same slot
names, but the order in which they are specified is not relevant.
........
r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Whitespace cleanup. Also remove the empty lines
from the previous check in.
........
r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines
Remove warning: funcion declaration isn't a prototype
........
r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines
Clean up formatting of this file.
The file should now follow PEP 7, except that it uses 4 space indents
(in the style of Py3k). This particular code would be really hard to
read with the regular tab idents.
Other changes:
- reflow long lines
- change multi-line conditionals to have test at end of line
........
r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line
Patch #1676994: Refactor test_popen2 to use unittest.
........
r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line
Remove test/output/test_popen2 (missed in r54417).
........
r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line
Patch 1339796: add a relpath() function to os.path.
........
r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines
Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
to complex using its __complex__() method before falling back to the
__float__() method. Therefore, the functions in the cmath module now
can operate on objects that define a __complex__() method.
(backport)
........
r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines
move note to the correct section
........
r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines
Patch #1678339: test case for bug in difflib.
........
r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line
Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines
Patch #1683328: fixes and enhancements for "unparse" demo.
........
r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line
Add some doc that was left out from some change to platform.py
........
r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line
Add a comment about 3k migration
........
r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line
Get rid of deprecation warning when testing commands.getstatus()
........
r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines
Try backing out 54407 to see if it corrects the problems on the Windows
buildbots. This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.
........
r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line
Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail). Should be backported (assuming it works :-)
........
r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines
Try to be a little more resilient to errors. This might help the test
pass, but my guess is that it won't. I'm guessing that some other
test is leaving this file open which means it can't be removed
under Windows AFAIK.
........
r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines
Try to get test_urllib to pass on Windows by closing the file.
I'm guessing that's the problem. h.getfile() must be called *after*
h.getreply() and the fp can be None.
I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not. I don't
know if this needs to be backported (assuming it actually works).
........
r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line
Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines
Fix for glob.py if filesystem encoding is None.
........
r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line
Remove unused file spotted by Paul Hankin
........
r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines
Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence".
........
r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines
New test for rev. 54407 which only uses directories under TESTFN.
........
r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines
Patch #1684834: document some utility C API functions.
........
r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines
Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line
Add comments on maintenance of this file
........
r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line
Fix sentence, and fix typo in example
........
r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line
Put code examples at left margin instead of indenting them
........
r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line
Minor clarification, saying that blocking means no timeout (from bug #882297)
........
r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines
Bug #1675967: re patterns pickled with older Python versions can
now be unpickled. Will backport.
........
r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line
Add test and fix for fromkeys() optional argument.
........
r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines
Bug #1685704: use -m switch in timeit docs.
........
r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines
Back out "Patch #1643874: memory leak in ctypes fixed."
The code in this patch leaves no way to give up the ownership of a
BSTR instance.
........
r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines
Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines
- Bug #1683368: The object.__init__() and object.__new__() methods are
now stricter in rejecting excess arguments. The only time when
either allows excess arguments is when it is not overridden and the
other one is. For backwards compatibility, when both are
overridden, it is a deprecation warning (for now; maybe a Py3k
warning later).
When merging this into 3.0, the warnings should become errors.
Note: without the change to string.py, lots of spurious warnings happen.
What's going on there?
........
r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line
Add Mark Dickinson for SF # 1675423.
........
r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines
Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
Will backport.
........
r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines
Bug #978833: Revert r50844, as it broke _socketobject.dup.
Will backport.
........
r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines
Add a type.__init__() method that enforces the same signature as
type.__new__(), and then calls object.__init__(cls), just to be anal.
This allows us to restore the code in string.py's _TemplateMetaclass
that called super(...).__init__(name, bases, dct), which I commented
out yesterday since it broke due to the stricter argument checking
added to object.__init__().
........
r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines
Added a 'create_connect()' function to socket.py, which creates a
connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.
........
r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines
Add note about type.__init__().
........
r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines
Prevent creation (followed by a segfault) of array types when the size
overflows the valid Py_ssize_t range. Check return values of
PyMem_Malloc.
Will backport to release25-maint.
........
r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines
Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
........
r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line
Make test_relpath() pass on Windows.
........
r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines
Patch #1489771: update syntax rules in Python Reference Manual.
Python 2.5 added support for explicit relative import statements and
yield expressions, which were missing in the manual.
Also fix grammar productions that used the names from the Grammar file,
markup that broke the generated grammar.txt, and wrap some lines that
broke the pdf output. Will backport.
........
r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines
Remove typo accent.
........
r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines
Revert accidental change.
........
r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines
Change the docs to no longer claim that unittest is preferred over doctest for
regression tests.
........
r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines
Redone the tests, using the infrastructure already present
for threading and socket serving.
........
r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines
Closing the HTTP connection after each test, and listening more.
........
r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines
Markup fix.
........
r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines
Added an optional timeout to FTP class. Also I started a test_ftplib.py
file to test the ftp lib (right now I included a basic test, the timeout
one, and nothing else).
........
r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines
Some nits.
........
r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines
Forgot to add the file before the previous commit, here go
the ftplib tests.
........
r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines
Added an optional timeout to poplib.POP3. Also created a
test_poplib.py file with a basic test and the timeout
ones. Docs are also updated.
........
r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines
The basic test cases of poplib.py.
........
r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines
Bug 1688393. Adds a control of negative values in
socket.recvfrom, which caused an ugly crash.
........
r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines
Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
the test_smtplib.py file, with a basic test and the timeout
ones. Docs are updated too.
........
r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines
Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
Thanks to Jerry Seutter for all three patches.
........
r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line
Make test_zipfile clean up its temporary files properly.
........
r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines
These are actually methods.
........
r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines
In Windows' time.clock(), when QueryPerformanceFrequency() fails,
the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
as for the POSIX implementation (thanks to #pypy).
........
r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines
Added timout parameter to telnetlib.Telnet. Also created
test_telnetlib.py with a basic test and timeout ones.
Docs are also updated.
........
r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
........
r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line
Bug #1688274: add documentation for C-level class objects.
........
r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines
Bump the patch level version of distutils since there were a few bug fixes since
the 2.5.0 release.
........
r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Label name fix.
........
r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line
Add item. (Oops, accidentally checked this in on my branch)
........
r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines
Duplicate label fix.
........
r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines
Markup fix.
........
r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines
repair string literal.
........
r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines
Markup fix.
........
r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines
Duplicate label fix.
........
r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines
Typo fix.
........
r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line
Fix method names. Will backport.
........
r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines
Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
returned by python-config if Python was built with --enable-shared
because that prevented the shared library from being used.
........
r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line
Shut up an occaisonal buildbot error due to test files being left around.
........
r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines
SF #1685563, MSVCCompiler creates redundant and long PATH strings
If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated. On Windows, this is a problem because the
path is limited to 4k. There's no benefit in adding a path multiple
times, so prevent that from occuring. We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
Will backport.
........
r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines
time.strptime's caching of its locale object was being recreated when the
locale changed but not used during the function call it was recreated during.
The test in this checkin is untested (OS X does not have the proper locale
support for me to test), although the fix for the bug this deals with
was tested by the OP (#1290505). Once the buildbots verify the test at least
doesn't fail it becomes a backport candidate.
........
r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines
Fix the test for recreating the locale cache object by not worrying about if
one of the test locales cannot be set.
........
r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix a lot of markup and meta-information glitches.
........
r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines
Another fix.
........
r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Lots of explicit class names for method and member descs.
........
r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines
Explicit class names.
........
r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines
Some semantic fixes.
........
r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines
Remove bogus entry.
........
r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines
Fix the class name of strings.
........
r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line
SF #1693079: Cannot save empty array in shelve
........
r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines
Array module's buffer interface can now handle empty arrays.
........
r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines
Fix warnings about object.__init__() signature.
Two (test_array and test_descr) were bug IMO; the third (copy_reg)
is a work-around which recognizes that object.__init__() doesn't do
anything.
........
r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line
SF 1602378 Clarify docstrings for bisect
........
r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines
SF #1382213: Tutorial section 9.5.1 ignores MRO for new-style classes
........
r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines
- Fix an off-by-one bug in locale.strxfrm().
patch taken from http://bugs.debian.org/416934.
........
r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines
Fix the strange case of
\begin{methoddesc}[NNTP]{...}
where
\ifx#1\@undefined ended up comparing N and N, therefore executing
the true part of the conditional, blowing up at \@undefined.
........
r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines
Now using unittest for the tests infraestructure. Also split the
tests in those who need the network, and that who doesn't.
........
r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines
Move the functionality for catching warnings in test_warnings.py into a separate
class to that reusing the functionality in test_structmembers.py doesn't rerun
the tests from test_warnings.py.
........
r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines
Document that CatchWarningTests is reused by test_structmembers.py.
........
r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines
Add tests for the filename.
Test that the stacklevel is handled correctly.
........
r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines
Added a SSL server to test_socket_ssl.py to be able to test
locally. Now, it checks if have openssl available and run
those specific tests (it starts openssl at the beggining of
all the tests and then kills it at the end).
........
r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines
Implement a contextmanager test.test_support.catch_warning that can
be used to catch the last warning issued by the warning framework.
Change test_warnings.py and test_structmembers.py to use this
new contextmanager.
........
r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines
Changed the whole structure of startup and checking if the
server is available. Hope to not get more false alarms.
........
r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines
Fixed the way that the .pem files are looked for, and changed
how to kill the process in win32 to use the _handle attribute.
........
r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines
Fix a race condition in this test -- instead of assuming that it will take
the test server thread at most 0.5 seconds to get ready, use an event
variable.
........
r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line
Clean up imports.
........
r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line
Stop using test_support.verify().
........
r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines
Bug #1686475: Support stat'ing open files on Windows again.
Will backport to 2.5.
........
r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_getopt use unittest.
........
r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line
Make test_softspace use unittest.
........
r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines
Fix WalkTests.test_traversal() on Windows. The cleanup in
MakedirTests.setUp() can now be removed.
........
r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines
Bug #1563759: struct.unpack doens't support buffer protocol objects
........
r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_long_future to use unittest.
........
r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line
Convert test_normalization to use unittest.
........
r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line
Some grammar fixes
........
r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_stringprep to use unittest.
........
r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line
Import cleanup in test_crypt.
........
r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_gc to use unittest.
........
r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_module to use unittest.
........
r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line
Convert test_fileinput to use unittest.
........
r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines
Doc that file.next() has undefined behaviour when called on a file opened with
'w'. Closes bug #1569057.
To be backported once 2.5 branch is unfrozen.
........
r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line
Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines
Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
........
r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines
Minor fix to the tests pass ok even with -O.
........
r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line
Typo fix.
........
r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines
General clean-up. Lot of margin corrections, comments, some typos.
Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.
........
r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines
Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line
Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line
Point readers at the patch submission instructions
........
r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line
Describe undocumented third argument to touchline()
........
r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines
Add some missing NULL checks which trigger crashes on low-memory conditions.
Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1191699: Make slices picklable
........
r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines
Exceptions are no longer old-style instances. Fix accordingly.
........
r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines
Repair missing spaces after \UNIX.
........
r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line
SF 1193128: Let str.translate(None) be an identity transformation
........
r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1698951: clarify deprecation message in rexec and Bastion
........
r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
........
r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines
Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines
Port r54805 from python25-maint branch:
Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read. Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write. This will definitely happen on Mac OS X and could potentially
happen on other platforms. See the comment for details.
........
r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line
Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line
Fix potential crash in path manipulation on windows
........
r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines
Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
is built before '_ctypes' is attempted.
Will backport to 2.5 once it is unfrozen for 2.5.1.
........
r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines
When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
........
r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line
SF #1701207, Fix bogus assertion (and test it!)
........
r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line
Check the availability of the urlfetch resource earlier than before.
........
r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines
Add Travis Oliphant.
........
r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines
Silence a compiler warning about incompatible pointer types.
........
r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines
SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines
Revert r53997 as per
http://mail.python.org/pipermail/python-dev/2007-March/071796.html .
I've kept a couple of still-valid extra tests in test_descr, but didn't
bother to sort through the new comments and refactorings added in r53997
to see if some of them could be kept. If so, they could go in a
follow-up check-in.
........
r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines
Fix a usage of the dangerous pattern decref - modify field - incref.
........
r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines
Add an optional address to copy the failure mails to.
Detect a conflict in the only file that should have outstanding changes
when this script is run. This doesn't matter on the trunk, but does
when run on a branch. Trunk always has the date set to today in
boilerplate.tex. Each time a release is cut with a different date,
a conflict occurs. (We could copy a known good version, but then
we would lose changes to this file.)
........
r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines
Bug #1704790: bind name "sys" locally in __del__ method so that it is
not cleared before __del__ is run.
........
r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines
Added tests for other methods of SSL object. Now we cover
all the object methods. This is the final step to close
the #451607 bug.
........
r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines
As specified in RFC 2616, 2xx code indicates that the client's
request was successfully received, understood, and accepted.
Now in these cases no error is raised. Also fixed tests.
........
r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line
Convert PyUnit -> unittest.
........
r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line
Remove code that hasn't been called in years.
........
r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line
Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines
Some new year updates.
........
r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines
Added a comment about last change in urllib2.py (all 2xx responses
are ok now).
........
r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines
Bug #1705717: error in sys.argv docs.
........
r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
........
r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line
Fix markup
........
r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line
Merge change 54909 from release25-maint: Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line
Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines
Patch #1698768: updated the "using Python on the Mac" intro.
........
r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines
Markup fix.
........
r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines
Whitespace normalization. Ugh, we really need to do this more often.
You might want to review this change as it's my first time. Be gentle. :-)
........
r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line
Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line
Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line
Change test_support.have_unicode to use True/False instead of 1/0.
........
r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines
Whitespace normalization.
........
r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines
Set missing svn:eol-style property on text files.
........
r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line
Import and raise statement cleanup.
........
r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line
Convert test_ossaudiodev to use unittest.
........
r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line
Fix an issue related to the unittest conversion.
........
r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line
fix some markup errors
........
r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line
Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode(). Use this function in posixmodule.c when implementing fdopen(). This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line
The locale "En" appears not to be valid on windows underi VisualStudio.2005. Added "English" to the test_locale.py to make the testsuite pass for that build
........
r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line
Minor wording change on slicing aide-memoire.
........
r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line
Accomodate 64 bit time_t in the _bsddb module.
........
2007-04-27 16:54:29 -03:00
|
|
|
|
a = array.array(typecode)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(re.compile(b"bla").match(a))
|
2008-08-19 14:56:33 -03:00
|
|
|
|
self.assertEqual(re.compile(b"").match(a).groups(), ())
|
2004-09-03 15:11:59 -03:00
|
|
|
|
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
def test_inline_flags(self):
|
|
|
|
|
# Bug #1700
|
2014-11-11 15:13:28 -04:00
|
|
|
|
upper_char = '\u1ea0' # Latin Capital Letter A with Dot Below
|
|
|
|
|
lower_char = '\u1ea1' # Latin Small Letter A with Dot Below
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('.' + upper_char, re.I | re.S)
|
|
|
|
|
q = p.match('\n' + lower_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('.' + lower_char, re.I | re.S)
|
|
|
|
|
q = p.match('\n' + upper_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('(?i).' + upper_char, re.S)
|
|
|
|
|
q = p.match('\n' + lower_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('(?i).' + lower_char, re.S)
|
|
|
|
|
q = p.match('\n' + upper_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('(?is).' + upper_char)
|
|
|
|
|
q = p.match('\n' + lower_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('(?is).' + lower_char)
|
|
|
|
|
q = p.match('\n' + upper_char)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(q)
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
|
2017-05-10 00:05:20 -03:00
|
|
|
|
p = re.compile('(?s)(?i).' + upper_char)
|
|
|
|
|
q = p.match('\n' + lower_char)
|
|
|
|
|
self.assertTrue(q)
|
|
|
|
|
|
|
|
|
|
p = re.compile('(?s)(?i).' + lower_char)
|
|
|
|
|
q = p.match('\n' + upper_char)
|
|
|
|
|
self.assertTrue(q)
|
|
|
|
|
|
|
|
|
|
self.assertTrue(re.match('(?ix) ' + upper_char, lower_char))
|
|
|
|
|
self.assertTrue(re.match('(?ix) ' + lower_char, upper_char))
|
|
|
|
|
self.assertTrue(re.match(' (?i) ' + upper_char, lower_char, re.X))
|
|
|
|
|
self.assertTrue(re.match('(?x) (?i) ' + upper_char, lower_char))
|
|
|
|
|
self.assertTrue(re.match(' (?x) (?i) ' + upper_char, lower_char, re.X))
|
2016-09-10 19:39:01 -03:00
|
|
|
|
|
2022-03-19 11:10:44 -03:00
|
|
|
|
msg = "global flags not at the start of the expression"
|
|
|
|
|
self.checkPatternError(upper_char + '(?i)', msg, 1)
|
2016-09-11 06:50:02 -03:00
|
|
|
|
|
2017-06-10 02:01:16 -03:00
|
|
|
|
# bpo-30605: Compiling a bytes instance regex was throwing a BytesWarning
|
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
|
warnings.simplefilter('error', BytesWarning)
|
2022-03-19 11:10:44 -03:00
|
|
|
|
self.checkPatternError(b'A(?i)', msg, 1)
|
|
|
|
|
|
|
|
|
|
self.checkPatternError('(?s).(?i)' + upper_char, msg, 5)
|
|
|
|
|
self.checkPatternError('(?i) ' + upper_char + ' (?x)', msg, 7)
|
|
|
|
|
self.checkPatternError(' (?x) (?i) ' + upper_char, msg, 1)
|
|
|
|
|
self.checkPatternError('^(?i)' + upper_char, msg, 1)
|
|
|
|
|
self.checkPatternError('$|(?i)' + upper_char, msg, 2)
|
|
|
|
|
self.checkPatternError('(?:(?i)' + upper_char + ')', msg, 3)
|
|
|
|
|
self.checkPatternError('(^)?(?(1)(?i)' + upper_char + ')', msg, 9)
|
|
|
|
|
self.checkPatternError('($)?(?(1)|(?i)' + upper_char + ')', msg, 10)
|
2017-05-10 00:05:20 -03:00
|
|
|
|
|
|
|
|
|
|
Merged revisions 59883-59920 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59887 | neal.norwitz | 2008-01-10 06:42:58 +0100 (Thu, 10 Jan 2008) | 1 line
Reword entry, not sure I made it much better though.
........
r59888 | andrew.kuchling | 2008-01-10 14:37:12 +0100 (Thu, 10 Jan 2008) | 1 line
Check for fd of -1 to save fsync() and fstat() call
........
r59891 | thomas.heller | 2008-01-10 19:45:40 +0100 (Thu, 10 Jan 2008) | 1 line
Reflow a paragraph, and fix a typo.
........
r59892 | raymond.hettinger | 2008-01-10 20:15:10 +0100 (Thu, 10 Jan 2008) | 1 line
Examples for named tuple subclassing should include __slots__
........
r59895 | raymond.hettinger | 2008-01-10 21:37:12 +0100 (Thu, 10 Jan 2008) | 1 line
Clarify how to add a field to a named tuple.
........
r59896 | amaury.forgeotdarc | 2008-01-10 22:59:42 +0100 (Thu, 10 Jan 2008) | 12 lines
Closing issue1761.
Surprising behaviour of the "$" regexp: it matches the
end of the string, AND just before the newline at the end
of the string::
re.sub('$', '#', 'foo\n') == 'foo#\n#'
Python is consistent with Perl and the pcre library, so
we just document it.
Guido prefers "\Z" to match only the end of the string.
........
r59898 | raymond.hettinger | 2008-01-11 00:00:01 +0100 (Fri, 11 Jan 2008) | 1 line
Neaten-up the named tuple docs
........
r59900 | raymond.hettinger | 2008-01-11 01:23:13 +0100 (Fri, 11 Jan 2008) | 1 line
Run doctests on the collections module
........
r59903 | raymond.hettinger | 2008-01-11 02:25:54 +0100 (Fri, 11 Jan 2008) | 1 line
Doctest results return a named tuple for readability
........
r59904 | raymond.hettinger | 2008-01-11 03:12:33 +0100 (Fri, 11 Jan 2008) | 1 line
Comment-out missing constant (from rev 59819)
........
r59905 | raymond.hettinger | 2008-01-11 03:24:13 +0100 (Fri, 11 Jan 2008) | 1 line
Have Decimal.as_tuple return a named tuple.
........
r59906 | raymond.hettinger | 2008-01-11 04:04:50 +0100 (Fri, 11 Jan 2008) | 1 line
Let most inspect functions return named tuples
........
r59907 | raymond.hettinger | 2008-01-11 04:20:54 +0100 (Fri, 11 Jan 2008) | 1 line
Improve usability of the SequenceMatcher by returning named tuples describing match ranges.
........
r59909 | thomas.heller | 2008-01-11 09:04:03 +0100 (Fri, 11 Jan 2008) | 1 line
Add an important missing blank.
........
r59910 | georg.brandl | 2008-01-11 10:19:11 +0100 (Fri, 11 Jan 2008) | 2 lines
Guard definition of TIPC_SUB_CANCEL with an #ifdef.
........
r59911 | georg.brandl | 2008-01-11 10:20:58 +0100 (Fri, 11 Jan 2008) | 2 lines
News entries for rev. 5990[567].
........
r59912 | georg.brandl | 2008-01-11 10:55:53 +0100 (Fri, 11 Jan 2008) | 2 lines
Documentation for r5990[3567].
........
r59913 | thomas.heller | 2008-01-11 13:41:39 +0100 (Fri, 11 Jan 2008) | 4 lines
The sqlite3 dll, when compiled in debug mode, must be linked with /MDd
to use the debug runtime library. Further, the dll will be named
sqlite3_d.dll.
........
r59919 | thomas.heller | 2008-01-11 16:38:46 +0100 (Fri, 11 Jan 2008) | 6 lines
Revert revision 59913, because it was wrong:
The sqlite3 dll, when compiled in debug mode, must be linked with
/MDd to use the debug runtime library. Further, the dll will be
named sqlite3_d.dll.
........
r59920 | christian.heimes | 2008-01-11 16:42:29 +0100 (Fri, 11 Jan 2008) | 1 line
Removed unused variable
........
2008-01-11 12:17:00 -04:00
|
|
|
|
def test_dollar_matches_twice(self):
|
2022-03-21 13:28:22 -03:00
|
|
|
|
r"""Test that $ does not include \n
|
|
|
|
|
$ matches the end of string, and just before the terminating \n"""
|
Merged revisions 59883-59920 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59887 | neal.norwitz | 2008-01-10 06:42:58 +0100 (Thu, 10 Jan 2008) | 1 line
Reword entry, not sure I made it much better though.
........
r59888 | andrew.kuchling | 2008-01-10 14:37:12 +0100 (Thu, 10 Jan 2008) | 1 line
Check for fd of -1 to save fsync() and fstat() call
........
r59891 | thomas.heller | 2008-01-10 19:45:40 +0100 (Thu, 10 Jan 2008) | 1 line
Reflow a paragraph, and fix a typo.
........
r59892 | raymond.hettinger | 2008-01-10 20:15:10 +0100 (Thu, 10 Jan 2008) | 1 line
Examples for named tuple subclassing should include __slots__
........
r59895 | raymond.hettinger | 2008-01-10 21:37:12 +0100 (Thu, 10 Jan 2008) | 1 line
Clarify how to add a field to a named tuple.
........
r59896 | amaury.forgeotdarc | 2008-01-10 22:59:42 +0100 (Thu, 10 Jan 2008) | 12 lines
Closing issue1761.
Surprising behaviour of the "$" regexp: it matches the
end of the string, AND just before the newline at the end
of the string::
re.sub('$', '#', 'foo\n') == 'foo#\n#'
Python is consistent with Perl and the pcre library, so
we just document it.
Guido prefers "\Z" to match only the end of the string.
........
r59898 | raymond.hettinger | 2008-01-11 00:00:01 +0100 (Fri, 11 Jan 2008) | 1 line
Neaten-up the named tuple docs
........
r59900 | raymond.hettinger | 2008-01-11 01:23:13 +0100 (Fri, 11 Jan 2008) | 1 line
Run doctests on the collections module
........
r59903 | raymond.hettinger | 2008-01-11 02:25:54 +0100 (Fri, 11 Jan 2008) | 1 line
Doctest results return a named tuple for readability
........
r59904 | raymond.hettinger | 2008-01-11 03:12:33 +0100 (Fri, 11 Jan 2008) | 1 line
Comment-out missing constant (from rev 59819)
........
r59905 | raymond.hettinger | 2008-01-11 03:24:13 +0100 (Fri, 11 Jan 2008) | 1 line
Have Decimal.as_tuple return a named tuple.
........
r59906 | raymond.hettinger | 2008-01-11 04:04:50 +0100 (Fri, 11 Jan 2008) | 1 line
Let most inspect functions return named tuples
........
r59907 | raymond.hettinger | 2008-01-11 04:20:54 +0100 (Fri, 11 Jan 2008) | 1 line
Improve usability of the SequenceMatcher by returning named tuples describing match ranges.
........
r59909 | thomas.heller | 2008-01-11 09:04:03 +0100 (Fri, 11 Jan 2008) | 1 line
Add an important missing blank.
........
r59910 | georg.brandl | 2008-01-11 10:19:11 +0100 (Fri, 11 Jan 2008) | 2 lines
Guard definition of TIPC_SUB_CANCEL with an #ifdef.
........
r59911 | georg.brandl | 2008-01-11 10:20:58 +0100 (Fri, 11 Jan 2008) | 2 lines
News entries for rev. 5990[567].
........
r59912 | georg.brandl | 2008-01-11 10:55:53 +0100 (Fri, 11 Jan 2008) | 2 lines
Documentation for r5990[3567].
........
r59913 | thomas.heller | 2008-01-11 13:41:39 +0100 (Fri, 11 Jan 2008) | 4 lines
The sqlite3 dll, when compiled in debug mode, must be linked with /MDd
to use the debug runtime library. Further, the dll will be named
sqlite3_d.dll.
........
r59919 | thomas.heller | 2008-01-11 16:38:46 +0100 (Fri, 11 Jan 2008) | 6 lines
Revert revision 59913, because it was wrong:
The sqlite3 dll, when compiled in debug mode, must be linked with
/MDd to use the debug runtime library. Further, the dll will be
named sqlite3_d.dll.
........
r59920 | christian.heimes | 2008-01-11 16:42:29 +0100 (Fri, 11 Jan 2008) | 1 line
Removed unused variable
........
2008-01-11 12:17:00 -04:00
|
|
|
|
pattern = re.compile('$')
|
|
|
|
|
self.assertEqual(pattern.sub('#', 'a\nb\n'), 'a\nb#\n#')
|
|
|
|
|
self.assertEqual(pattern.sub('#', 'a\nb\nc'), 'a\nb\nc#')
|
|
|
|
|
self.assertEqual(pattern.sub('#', '\n'), '#\n#')
|
|
|
|
|
|
|
|
|
|
pattern = re.compile('$', re.MULTILINE)
|
|
|
|
|
self.assertEqual(pattern.sub('#', 'a\nb\n' ), 'a#\nb#\n#' )
|
|
|
|
|
self.assertEqual(pattern.sub('#', 'a\nb\nc'), 'a#\nb#\nc#')
|
|
|
|
|
self.assertEqual(pattern.sub('#', '\n'), '#\n#')
|
|
|
|
|
|
2008-08-19 14:56:33 -03:00
|
|
|
|
def test_bytes_str_mixing(self):
|
|
|
|
|
# Mixing str and bytes is disallowed
|
|
|
|
|
pat = re.compile('.')
|
|
|
|
|
bpat = re.compile(b'.')
|
|
|
|
|
self.assertRaises(TypeError, pat.match, b'b')
|
|
|
|
|
self.assertRaises(TypeError, bpat.match, 'b')
|
|
|
|
|
self.assertRaises(TypeError, pat.sub, b'b', 'c')
|
|
|
|
|
self.assertRaises(TypeError, pat.sub, 'b', b'c')
|
|
|
|
|
self.assertRaises(TypeError, pat.sub, b'b', b'c')
|
|
|
|
|
self.assertRaises(TypeError, bpat.sub, b'b', 'c')
|
|
|
|
|
self.assertRaises(TypeError, bpat.sub, 'b', b'c')
|
|
|
|
|
self.assertRaises(TypeError, bpat.sub, 'b', 'c')
|
|
|
|
|
|
|
|
|
|
def test_ascii_and_unicode_flag(self):
|
|
|
|
|
# String patterns
|
|
|
|
|
for flags in (0, re.UNICODE):
|
|
|
|
|
pat = re.compile('\xc0', flags | re.IGNORECASE)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(pat.match('\xe0'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(r'\w', flags)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(pat.match('\xe0'))
|
2008-08-19 14:56:33 -03:00
|
|
|
|
pat = re.compile('\xc0', re.ASCII | re.IGNORECASE)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match('\xe0'))
|
2008-08-19 14:56:33 -03:00
|
|
|
|
pat = re.compile('(?a)\xc0', re.IGNORECASE)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match('\xe0'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(r'\w', re.ASCII)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match('\xe0'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(r'(?a)\w')
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match('\xe0'))
|
2008-08-19 14:56:33 -03:00
|
|
|
|
# Bytes patterns
|
|
|
|
|
for flags in (0, re.ASCII):
|
2014-09-14 09:56:27 -03:00
|
|
|
|
pat = re.compile(b'\xc0', flags | re.IGNORECASE)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match(b'\xe0'))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(br'\w', flags)
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertIsNone(pat.match(b'\xe0'))
|
2008-08-19 14:56:33 -03:00
|
|
|
|
# Incompatibilities
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertRaises(ValueError, re.compile, br'\w', re.UNICODE)
|
2017-10-24 17:31:42 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, br'(?u)\w')
|
2016-09-08 14:59:53 -03:00
|
|
|
|
self.assertRaises(ValueError, re.compile, r'\w', re.UNICODE | re.ASCII)
|
|
|
|
|
self.assertRaises(ValueError, re.compile, r'(?u)\w', re.ASCII)
|
|
|
|
|
self.assertRaises(ValueError, re.compile, r'(?a)\w', re.UNICODE)
|
2017-10-24 17:31:42 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, r'(?au)\w')
|
2008-08-19 14:56:33 -03:00
|
|
|
|
|
2014-12-01 05:50:07 -04:00
|
|
|
|
def test_locale_flag(self):
|
2019-02-28 19:08:03 -04:00
|
|
|
|
enc = locale.getpreferredencoding()
|
2014-12-01 05:50:07 -04:00
|
|
|
|
# Search non-ASCII letter
|
|
|
|
|
for i in range(128, 256):
|
|
|
|
|
try:
|
|
|
|
|
c = bytes([i]).decode(enc)
|
|
|
|
|
sletter = c.lower()
|
|
|
|
|
if sletter == c: continue
|
|
|
|
|
bletter = sletter.encode(enc)
|
|
|
|
|
if len(bletter) != 1: continue
|
|
|
|
|
if bletter.decode(enc) != sletter: continue
|
|
|
|
|
bpat = re.escape(bytes([i]))
|
|
|
|
|
break
|
|
|
|
|
except (UnicodeError, TypeError):
|
|
|
|
|
pass
|
2017-03-02 01:53:00 -04:00
|
|
|
|
else:
|
|
|
|
|
bletter = None
|
|
|
|
|
bpat = b'A'
|
2014-12-01 05:50:07 -04:00
|
|
|
|
# Bytes patterns
|
|
|
|
|
pat = re.compile(bpat, re.LOCALE | re.IGNORECASE)
|
|
|
|
|
if bletter:
|
|
|
|
|
self.assertTrue(pat.match(bletter))
|
|
|
|
|
pat = re.compile(b'(?L)' + bpat, re.IGNORECASE)
|
|
|
|
|
if bletter:
|
|
|
|
|
self.assertTrue(pat.match(bletter))
|
|
|
|
|
pat = re.compile(bpat, re.IGNORECASE)
|
|
|
|
|
if bletter:
|
|
|
|
|
self.assertIsNone(pat.match(bletter))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(br'\w', re.LOCALE)
|
2014-12-01 05:50:07 -04:00
|
|
|
|
if bletter:
|
|
|
|
|
self.assertTrue(pat.match(bletter))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(br'(?L)\w')
|
2014-12-01 05:50:07 -04:00
|
|
|
|
if bletter:
|
|
|
|
|
self.assertTrue(pat.match(bletter))
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(br'\w')
|
2014-12-01 05:50:07 -04:00
|
|
|
|
if bletter:
|
|
|
|
|
self.assertIsNone(pat.match(bletter))
|
|
|
|
|
# Incompatibilities
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(ValueError, re.compile, '', re.LOCALE)
|
2017-10-24 17:31:42 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, '(?L)')
|
2016-06-11 13:15:00 -03:00
|
|
|
|
self.assertRaises(ValueError, re.compile, b'', re.LOCALE | re.ASCII)
|
|
|
|
|
self.assertRaises(ValueError, re.compile, b'(?L)', re.ASCII)
|
|
|
|
|
self.assertRaises(ValueError, re.compile, b'(?a)', re.LOCALE)
|
2017-10-24 17:31:42 -03:00
|
|
|
|
self.assertRaises(re.error, re.compile, b'(?aL)')
|
2014-12-01 05:50:07 -04:00
|
|
|
|
|
2016-09-09 18:57:55 -03:00
|
|
|
|
def test_scoped_flags(self):
|
|
|
|
|
self.assertTrue(re.match(r'(?i:a)b', 'Ab'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?i:a)b', 'aB'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?-i:a)b', 'Ab', re.IGNORECASE))
|
|
|
|
|
self.assertTrue(re.match(r'(?-i:a)b', 'aB', re.IGNORECASE))
|
|
|
|
|
self.assertIsNone(re.match(r'(?i:(?-i:a)b)', 'Ab'))
|
|
|
|
|
self.assertTrue(re.match(r'(?i:(?-i:a)b)', 'aB'))
|
|
|
|
|
|
2017-10-24 17:31:42 -03:00
|
|
|
|
self.assertTrue(re.match(r'\w(?a:\W)\w', '\xe0\xe0\xe0'))
|
|
|
|
|
self.assertTrue(re.match(r'(?a:\W(?u:\w)\W)', '\xe0\xe0\xe0'))
|
|
|
|
|
self.assertTrue(re.match(r'\W(?u:\w)\W', '\xe0\xe0\xe0', re.ASCII))
|
|
|
|
|
|
2016-09-09 18:57:55 -03:00
|
|
|
|
self.checkPatternError(r'(?a)(?-a:\w)',
|
2017-10-24 17:31:42 -03:00
|
|
|
|
"bad inline flags: cannot turn off flags 'a', 'u' and 'L'", 8)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
self.checkPatternError(r'(?i-i:a)',
|
2017-10-24 17:31:42 -03:00
|
|
|
|
'bad inline flags: flag turned on and off', 5)
|
|
|
|
|
self.checkPatternError(r'(?au:a)',
|
|
|
|
|
"bad inline flags: flags 'a', 'u' and 'L' are incompatible", 4)
|
|
|
|
|
self.checkPatternError(br'(?aL:a)',
|
|
|
|
|
"bad inline flags: flags 'a', 'u' and 'L' are incompatible", 4)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
|
|
|
|
|
self.checkPatternError(r'(?-', 'missing flag', 3)
|
|
|
|
|
self.checkPatternError(r'(?-+', 'missing flag', 3)
|
|
|
|
|
self.checkPatternError(r'(?-z', 'unknown flag', 3)
|
|
|
|
|
self.checkPatternError(r'(?-i', 'missing :', 4)
|
|
|
|
|
self.checkPatternError(r'(?-i)', 'missing :', 4)
|
|
|
|
|
self.checkPatternError(r'(?-i+', 'missing :', 4)
|
|
|
|
|
self.checkPatternError(r'(?-iz', 'unknown flag', 4)
|
|
|
|
|
self.checkPatternError(r'(?i:', 'missing ), unterminated subpattern', 0)
|
|
|
|
|
self.checkPatternError(r'(?i', 'missing -, : or )', 3)
|
|
|
|
|
self.checkPatternError(r'(?i+', 'missing -, : or )', 3)
|
|
|
|
|
self.checkPatternError(r'(?iz', 'unknown flag', 3)
|
|
|
|
|
|
2022-04-23 06:49:06 -03:00
|
|
|
|
def test_ignore_spaces(self):
|
|
|
|
|
for space in " \t\n\r\v\f":
|
|
|
|
|
self.assertTrue(re.fullmatch(space + 'a', 'a', re.VERBOSE))
|
|
|
|
|
for space in b" ", b"\t", b"\n", b"\r", b"\v", b"\f":
|
|
|
|
|
self.assertTrue(re.fullmatch(space + b'a', b'a', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x) a', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(' (?x) a', 'a', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x) (?x) a', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(' a(?x: b) c', ' ab c'))
|
|
|
|
|
self.assertTrue(re.fullmatch(' a(?-x: b) c', 'a bc', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x) a(?-x: b) c', 'a bc'))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x) a| b', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x) a| b', 'b'))
|
|
|
|
|
|
|
|
|
|
def test_comments(self):
|
|
|
|
|
self.assertTrue(re.fullmatch('#x\na', 'a', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch(b'#x\na', b'a', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x)#x\na', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch('#x\n(?x)#y\na', 'a', re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x)#x\n(?x)#y\na', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch('#x\na(?x:#y\nb)#z\nc', '#x\nab#z\nc'))
|
|
|
|
|
self.assertTrue(re.fullmatch('#x\na(?-x:#y\nb)#z\nc', 'a#y\nbc',
|
|
|
|
|
re.VERBOSE))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x)#x\na(?-x:#y\nb)#z\nc', 'a#y\nbc'))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x)#x\na|#y\nb', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch('(?x)#x\na|#y\nb', 'b'))
|
|
|
|
|
|
2010-03-06 11:24:08 -04:00
|
|
|
|
def test_bug_6509(self):
|
|
|
|
|
# Replacement strings of both types must parse properly.
|
|
|
|
|
# all strings
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(r'a(\w)')
|
2010-03-06 11:24:08 -04:00
|
|
|
|
self.assertEqual(pat.sub('b\\1', 'ac'), 'bc')
|
|
|
|
|
pat = re.compile('a(.)')
|
|
|
|
|
self.assertEqual(pat.sub('b\\1', 'a\u1234'), 'b\u1234')
|
|
|
|
|
pat = re.compile('..')
|
|
|
|
|
self.assertEqual(pat.sub(lambda m: 'str', 'a5'), 'str')
|
|
|
|
|
|
|
|
|
|
# all bytes
|
2016-09-08 14:59:53 -03:00
|
|
|
|
pat = re.compile(br'a(\w)')
|
2010-03-06 11:24:08 -04:00
|
|
|
|
self.assertEqual(pat.sub(b'b\\1', b'ac'), b'bc')
|
|
|
|
|
pat = re.compile(b'a(.)')
|
|
|
|
|
self.assertEqual(pat.sub(b'b\\1', b'a\xCD'), b'b\xCD')
|
|
|
|
|
pat = re.compile(b'..')
|
|
|
|
|
self.assertEqual(pat.sub(lambda m: b'bytes', b'a5'), b'bytes')
|
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
|
def test_search_dot_unicode(self):
|
2014-09-14 10:20:20 -03:00
|
|
|
|
self.assertTrue(re.search("123.*-", '123abc-'))
|
|
|
|
|
self.assertTrue(re.search("123.*-", '123\xe9-'))
|
|
|
|
|
self.assertTrue(re.search("123.*-", '123\u20ac-'))
|
|
|
|
|
self.assertTrue(re.search("123.*-", '123\U0010ffff-'))
|
|
|
|
|
self.assertTrue(re.search("123.*-", '123\xe9\u20ac\U0010ffff-'))
|
2011-09-28 02:41:54 -03:00
|
|
|
|
|
2012-03-12 20:29:48 -03:00
|
|
|
|
def test_compile(self):
|
|
|
|
|
# Test return value when given string and pattern as parameter
|
|
|
|
|
pattern = re.compile('random pattern')
|
2017-10-04 14:09:49 -03:00
|
|
|
|
self.assertIsInstance(pattern, re.Pattern)
|
2012-03-12 20:29:48 -03:00
|
|
|
|
same_pattern = re.compile(pattern)
|
2017-10-04 14:09:49 -03:00
|
|
|
|
self.assertIsInstance(same_pattern, re.Pattern)
|
2012-03-12 20:29:48 -03:00
|
|
|
|
self.assertIs(same_pattern, pattern)
|
|
|
|
|
# Test behaviour when not given a string or pattern as parameter
|
|
|
|
|
self.assertRaises(TypeError, re.compile, 0)
|
|
|
|
|
|
2012-12-03 15:55:56 -04:00
|
|
|
|
@bigmemtest(size=_2G, memuse=1)
|
2012-12-03 15:53:12 -04:00
|
|
|
|
def test_large_search(self, size):
|
|
|
|
|
# Issue #10182: indices were 32-bit-truncated.
|
|
|
|
|
s = 'a' * size
|
|
|
|
|
m = re.search('$', s)
|
|
|
|
|
self.assertIsNotNone(m)
|
2012-12-03 16:08:43 -04:00
|
|
|
|
self.assertEqual(m.start(), size)
|
|
|
|
|
self.assertEqual(m.end(), size)
|
2012-12-03 15:53:12 -04:00
|
|
|
|
|
2012-12-02 07:52:36 -04:00
|
|
|
|
# The huge memuse is because of re.sub() using a list and a join()
|
|
|
|
|
# to create the replacement result.
|
2012-12-03 15:55:56 -04:00
|
|
|
|
@bigmemtest(size=_2G, memuse=16 + 2)
|
2012-12-03 15:53:12 -04:00
|
|
|
|
def test_large_subn(self, size):
|
2012-12-02 07:52:36 -04:00
|
|
|
|
# Issue #10182: indices were 32-bit-truncated.
|
|
|
|
|
s = 'a' * size
|
|
|
|
|
r, n = re.subn('', '', s)
|
|
|
|
|
self.assertEqual(r, s)
|
|
|
|
|
self.assertEqual(n, size + 1)
|
|
|
|
|
|
2012-12-29 17:38:48 -04:00
|
|
|
|
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))
|
2012-12-02 07:52:36 -04:00
|
|
|
|
|
2013-02-16 10:47:47 -04:00
|
|
|
|
def test_repeat_minmax_overflow(self):
|
|
|
|
|
# Issue #13169
|
|
|
|
|
string = "x" * 100000
|
|
|
|
|
self.assertEqual(re.match(r".{65535}", string).span(), (0, 65535))
|
|
|
|
|
self.assertEqual(re.match(r".{,65535}", string).span(), (0, 65535))
|
|
|
|
|
self.assertEqual(re.match(r".{65535,}?", string).span(), (0, 65535))
|
|
|
|
|
self.assertEqual(re.match(r".{65536}", string).span(), (0, 65536))
|
|
|
|
|
self.assertEqual(re.match(r".{,65536}", string).span(), (0, 65536))
|
|
|
|
|
self.assertEqual(re.match(r".{65536,}?", string).span(), (0, 65536))
|
|
|
|
|
# 2**128 should be big enough to overflow both SRE_CODE and Py_ssize_t.
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{%d}" % 2**128)
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{,%d}" % 2**128)
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{%d,}?" % 2**128)
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{%d,%d}" % (2**129, 2**128))
|
|
|
|
|
|
2013-04-14 14:00:54 -03:00
|
|
|
|
def test_backref_group_name_in_exception(self):
|
|
|
|
|
# Issue 17341: Poor error message when compiling invalid regex
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError('(?P=<foo>)',
|
|
|
|
|
"bad character in group name '<foo>'", 4)
|
2013-04-14 14:00:54 -03:00
|
|
|
|
|
|
|
|
|
def test_group_name_in_exception(self):
|
|
|
|
|
# Issue 17341: Poor error message when compiling invalid regex
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError('(?P<?foo>)',
|
|
|
|
|
"bad character in group name '?foo'", 4)
|
2013-04-14 14:00:54 -03:00
|
|
|
|
|
2013-08-03 13:18:38 -03:00
|
|
|
|
def test_issue17998(self):
|
|
|
|
|
for reps in '*', '+', '?', '{1}':
|
|
|
|
|
for mod in '', '?':
|
|
|
|
|
pattern = '.' + reps + mod + 'yz'
|
|
|
|
|
self.assertEqual(re.compile(pattern, re.S).findall('xyz'),
|
|
|
|
|
['xyz'], msg=pattern)
|
|
|
|
|
pattern = pattern.encode()
|
|
|
|
|
self.assertEqual(re.compile(pattern, re.S).findall(b'xyz'),
|
|
|
|
|
[b'xyz'], msg=pattern)
|
|
|
|
|
|
2013-10-20 07:13:31 -03:00
|
|
|
|
def test_match_repr(self):
|
|
|
|
|
for string in '[abracadabra]', S('[abracadabra]'):
|
|
|
|
|
m = re.search(r'(.+)(.*?)\1', string)
|
2019-05-21 14:09:21 -03:00
|
|
|
|
pattern = r"<(%s\.)?%s object; span=\(1, 12\), match='abracadabra'>" % (
|
|
|
|
|
type(m).__module__, type(m).__qualname__
|
|
|
|
|
)
|
|
|
|
|
self.assertRegex(repr(m), pattern)
|
2013-10-20 07:13:31 -03:00
|
|
|
|
for string in (b'[abracadabra]', B(b'[abracadabra]'),
|
|
|
|
|
bytearray(b'[abracadabra]'),
|
|
|
|
|
memoryview(b'[abracadabra]')):
|
2016-09-08 14:59:53 -03:00
|
|
|
|
m = re.search(br'(.+)(.*?)\1', string)
|
2019-05-21 14:09:21 -03:00
|
|
|
|
pattern = r"<(%s\.)?%s object; span=\(1, 12\), match=b'abracadabra'>" % (
|
|
|
|
|
type(m).__module__, type(m).__qualname__
|
|
|
|
|
)
|
|
|
|
|
self.assertRegex(repr(m), pattern)
|
2013-10-20 07:13:31 -03:00
|
|
|
|
|
|
|
|
|
first, second = list(re.finditer("(aa)|(bb)", "aa bb"))
|
2019-05-21 14:09:21 -03:00
|
|
|
|
pattern = r"<(%s\.)?%s object; span=\(0, 2\), match='aa'>" % (
|
|
|
|
|
type(second).__module__, type(second).__qualname__
|
|
|
|
|
)
|
|
|
|
|
self.assertRegex(repr(first), pattern)
|
|
|
|
|
pattern = r"<(%s\.)?%s object; span=\(3, 5\), match='bb'>" % (
|
|
|
|
|
type(second).__module__, type(second).__qualname__
|
|
|
|
|
)
|
|
|
|
|
self.assertRegex(repr(second), pattern)
|
2013-10-20 07:13:31 -03:00
|
|
|
|
|
2017-12-04 08:29:05 -04:00
|
|
|
|
def test_zerowidth(self):
|
|
|
|
|
# Issues 852532, 1647489, 3262, 25054.
|
|
|
|
|
self.assertEqual(re.split(r"\b", "a::bc"), ['', 'a', '::', 'bc', ''])
|
2018-01-04 05:06:13 -04:00
|
|
|
|
self.assertEqual(re.split(r"\b|:+", "a::bc"), ['', 'a', '', '', 'bc', ''])
|
|
|
|
|
self.assertEqual(re.split(r"(?<!\w)(?=\w)|:+", "a::bc"), ['', 'a', '', 'bc'])
|
2017-12-04 08:29:05 -04:00
|
|
|
|
self.assertEqual(re.split(r"(?<=\w)(?!\w)|:+", "a::bc"), ['a', '', 'bc', ''])
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.sub(r"\b", "-", "a::bc"), '-a-::-bc-')
|
2018-01-04 05:06:13 -04:00
|
|
|
|
self.assertEqual(re.sub(r"\b|:+", "-", "a::bc"), '-a---bc-')
|
|
|
|
|
self.assertEqual(re.sub(r"(\b|:+)", r"[\1]", "a::bc"), '[]a[][::][]bc[]')
|
2017-12-04 08:29:05 -04:00
|
|
|
|
|
|
|
|
|
self.assertEqual(re.findall(r"\b|:+", "a::bc"), ['', '', '::', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r"\b|\w+", "a::bc"),
|
|
|
|
|
['', 'a', '', '', 'bc', ''])
|
|
|
|
|
|
|
|
|
|
self.assertEqual([m.span() for m in re.finditer(r"\b|:+", "a::bc")],
|
|
|
|
|
[(0, 0), (1, 1), (1, 3), (3, 3), (5, 5)])
|
|
|
|
|
self.assertEqual([m.span() for m in re.finditer(r"\b|\w+", "a::bc")],
|
|
|
|
|
[(0, 0), (0, 1), (1, 1), (3, 3), (3, 5), (5, 5)])
|
2013-02-16 10:47:47 -04:00
|
|
|
|
|
2013-08-19 17:18:23 -03:00
|
|
|
|
def test_bug_2537(self):
|
|
|
|
|
# issue 2537: empty submatches
|
|
|
|
|
for outer_op in ('{0,}', '*', '+', '{1,187}'):
|
|
|
|
|
for inner_op in ('{0,}', '*', '?'):
|
|
|
|
|
r = re.compile("^((x|y)%s)%s" % (inner_op, outer_op))
|
|
|
|
|
m = r.match("xyyzy")
|
|
|
|
|
self.assertEqual(m.group(0), "xyy")
|
|
|
|
|
self.assertEqual(m.group(1), "")
|
|
|
|
|
self.assertEqual(m.group(2), "y")
|
|
|
|
|
|
2014-03-06 05:28:32 -04:00
|
|
|
|
def test_keyword_parameters(self):
|
|
|
|
|
# Issue #20283: Accepting the string keyword parameter.
|
|
|
|
|
pat = re.compile(r'(ab)')
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.match(string='abracadabra', pos=7, endpos=10).span(), (7, 9))
|
2014-03-06 05:36:15 -04:00
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.fullmatch(string='abracadabra', pos=7, endpos=9).span(), (7, 9))
|
2014-03-06 05:28:32 -04:00
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.search(string='abracadabra', pos=3, endpos=10).span(), (7, 9))
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.findall(string='abracadabra', pos=3, endpos=10), ['ab'])
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.split(string='abracadabra', maxsplit=1),
|
|
|
|
|
['', 'ab', 'racadabra'])
|
|
|
|
|
self.assertEqual(
|
|
|
|
|
pat.scanner(string='abracadabra', pos=3, endpos=10).search().span(),
|
|
|
|
|
(7, 9))
|
|
|
|
|
|
2014-05-14 15:48:17 -03:00
|
|
|
|
def test_bug_20998(self):
|
|
|
|
|
# Issue #20998: Fullmatch of repeated single character pattern
|
|
|
|
|
# with ignore case.
|
|
|
|
|
self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))
|
|
|
|
|
|
2022-05-16 11:02:37 -03:00
|
|
|
|
@unittest.skipIf(
|
|
|
|
|
is_emscripten or is_wasi,
|
|
|
|
|
"musl libc issue on Emscripten/WASI, bpo-46390"
|
|
|
|
|
)
|
2014-10-30 19:53:49 -03:00
|
|
|
|
def test_locale_caching(self):
|
|
|
|
|
# Issue #22410
|
|
|
|
|
oldlocale = locale.setlocale(locale.LC_CTYPE)
|
|
|
|
|
self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
|
|
|
|
|
for loc in 'en_US.iso88591', 'en_US.utf8':
|
|
|
|
|
try:
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, loc)
|
|
|
|
|
except locale.Error:
|
|
|
|
|
# Unsupported locale on this system
|
|
|
|
|
self.skipTest('test needs %s locale' % loc)
|
|
|
|
|
|
|
|
|
|
re.purge()
|
|
|
|
|
self.check_en_US_iso88591()
|
|
|
|
|
self.check_en_US_utf8()
|
|
|
|
|
re.purge()
|
|
|
|
|
self.check_en_US_utf8()
|
|
|
|
|
self.check_en_US_iso88591()
|
|
|
|
|
|
|
|
|
|
def check_en_US_iso88591(self):
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, 'en_US.iso88591')
|
|
|
|
|
self.assertTrue(re.match(b'\xc5\xe5', b'\xc5\xe5', re.L|re.I))
|
|
|
|
|
self.assertTrue(re.match(b'\xc5', b'\xe5', re.L|re.I))
|
|
|
|
|
self.assertTrue(re.match(b'\xe5', b'\xc5', re.L|re.I))
|
|
|
|
|
self.assertTrue(re.match(b'(?Li)\xc5\xe5', b'\xc5\xe5'))
|
|
|
|
|
self.assertTrue(re.match(b'(?Li)\xc5', b'\xe5'))
|
|
|
|
|
self.assertTrue(re.match(b'(?Li)\xe5', b'\xc5'))
|
|
|
|
|
|
|
|
|
|
def check_en_US_utf8(self):
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, 'en_US.utf8')
|
|
|
|
|
self.assertTrue(re.match(b'\xc5\xe5', b'\xc5\xe5', re.L|re.I))
|
|
|
|
|
self.assertIsNone(re.match(b'\xc5', b'\xe5', re.L|re.I))
|
|
|
|
|
self.assertIsNone(re.match(b'\xe5', b'\xc5', re.L|re.I))
|
|
|
|
|
self.assertTrue(re.match(b'(?Li)\xc5\xe5', b'\xc5\xe5'))
|
|
|
|
|
self.assertIsNone(re.match(b'(?Li)\xc5', b'\xe5'))
|
|
|
|
|
self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5'))
|
|
|
|
|
|
2022-05-16 11:02:37 -03:00
|
|
|
|
@unittest.skipIf(
|
|
|
|
|
is_emscripten or is_wasi,
|
|
|
|
|
"musl libc issue on Emscripten/WASI, bpo-46390"
|
|
|
|
|
)
|
2017-05-05 02:53:40 -03:00
|
|
|
|
def test_locale_compiled(self):
|
|
|
|
|
oldlocale = locale.setlocale(locale.LC_CTYPE)
|
|
|
|
|
self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
|
|
|
|
|
for loc in 'en_US.iso88591', 'en_US.utf8':
|
|
|
|
|
try:
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, loc)
|
|
|
|
|
except locale.Error:
|
|
|
|
|
# Unsupported locale on this system
|
|
|
|
|
self.skipTest('test needs %s locale' % loc)
|
|
|
|
|
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, 'en_US.iso88591')
|
|
|
|
|
p1 = re.compile(b'\xc5\xe5', re.L|re.I)
|
|
|
|
|
p2 = re.compile(b'[a\xc5][a\xe5]', re.L|re.I)
|
|
|
|
|
p3 = re.compile(b'[az\xc5][az\xe5]', re.L|re.I)
|
|
|
|
|
p4 = re.compile(b'[^\xc5][^\xe5]', re.L|re.I)
|
|
|
|
|
for p in p1, p2, p3:
|
|
|
|
|
self.assertTrue(p.match(b'\xc5\xe5'))
|
|
|
|
|
self.assertTrue(p.match(b'\xe5\xe5'))
|
|
|
|
|
self.assertTrue(p.match(b'\xc5\xc5'))
|
|
|
|
|
self.assertIsNone(p4.match(b'\xe5\xc5'))
|
|
|
|
|
self.assertIsNone(p4.match(b'\xe5\xe5'))
|
|
|
|
|
self.assertIsNone(p4.match(b'\xc5\xc5'))
|
|
|
|
|
|
|
|
|
|
locale.setlocale(locale.LC_CTYPE, 'en_US.utf8')
|
|
|
|
|
for p in p1, p2, p3:
|
|
|
|
|
self.assertTrue(p.match(b'\xc5\xe5'))
|
|
|
|
|
self.assertIsNone(p.match(b'\xe5\xe5'))
|
|
|
|
|
self.assertIsNone(p.match(b'\xc5\xc5'))
|
|
|
|
|
self.assertTrue(p4.match(b'\xe5\xc5'))
|
|
|
|
|
self.assertIsNone(p4.match(b'\xe5\xe5'))
|
|
|
|
|
self.assertIsNone(p4.match(b'\xc5\xc5'))
|
|
|
|
|
|
2014-11-10 07:49:00 -04:00
|
|
|
|
def test_error(self):
|
|
|
|
|
with self.assertRaises(re.error) as cm:
|
|
|
|
|
re.compile('(\u20ac))')
|
|
|
|
|
err = cm.exception
|
|
|
|
|
self.assertIsInstance(err.pattern, str)
|
|
|
|
|
self.assertEqual(err.pattern, '(\u20ac))')
|
|
|
|
|
self.assertEqual(err.pos, 3)
|
|
|
|
|
self.assertEqual(err.lineno, 1)
|
|
|
|
|
self.assertEqual(err.colno, 4)
|
|
|
|
|
self.assertIn(err.msg, str(err))
|
|
|
|
|
self.assertIn(' at position 3', str(err))
|
|
|
|
|
self.assertNotIn(' at position 3', err.msg)
|
|
|
|
|
# Bytes pattern
|
|
|
|
|
with self.assertRaises(re.error) as cm:
|
|
|
|
|
re.compile(b'(\xa4))')
|
|
|
|
|
err = cm.exception
|
|
|
|
|
self.assertIsInstance(err.pattern, bytes)
|
|
|
|
|
self.assertEqual(err.pattern, b'(\xa4))')
|
|
|
|
|
self.assertEqual(err.pos, 3)
|
|
|
|
|
# Multiline pattern
|
|
|
|
|
with self.assertRaises(re.error) as cm:
|
|
|
|
|
re.compile("""
|
|
|
|
|
(
|
|
|
|
|
abc
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
(
|
|
|
|
|
""", re.VERBOSE)
|
|
|
|
|
err = cm.exception
|
|
|
|
|
self.assertEqual(err.pos, 77)
|
|
|
|
|
self.assertEqual(err.lineno, 5)
|
|
|
|
|
self.assertEqual(err.colno, 17)
|
|
|
|
|
self.assertIn(err.msg, str(err))
|
|
|
|
|
self.assertIn(' at position 77', str(err))
|
|
|
|
|
self.assertIn('(line 5, column 17)', str(err))
|
|
|
|
|
|
2015-03-25 16:03:47 -03:00
|
|
|
|
def test_misc_errors(self):
|
|
|
|
|
self.checkPatternError(r'(', 'missing ), unterminated subpattern', 0)
|
|
|
|
|
self.checkPatternError(r'((a|b)', 'missing ), unterminated subpattern', 0)
|
|
|
|
|
self.checkPatternError(r'(a|b))', 'unbalanced parenthesis', 5)
|
|
|
|
|
self.checkPatternError(r'(?P', 'unexpected end of pattern', 3)
|
|
|
|
|
self.checkPatternError(r'(?z)', 'unknown extension ?z', 1)
|
|
|
|
|
self.checkPatternError(r'(?iz)', 'unknown flag', 3)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
self.checkPatternError(r'(?i', 'missing -, : or )', 3)
|
2015-03-25 16:03:47 -03:00
|
|
|
|
self.checkPatternError(r'(?#abc', 'missing ), unterminated comment', 0)
|
|
|
|
|
self.checkPatternError(r'(?<', 'unexpected end of pattern', 3)
|
|
|
|
|
self.checkPatternError(r'(?<>)', 'unknown extension ?<>', 1)
|
|
|
|
|
self.checkPatternError(r'(?', 'unexpected end of pattern', 2)
|
|
|
|
|
|
2016-11-14 07:38:43 -04:00
|
|
|
|
def test_enum(self):
|
|
|
|
|
# Issue #28082: Check that str(flag) returns a human readable string
|
|
|
|
|
# instead of an integer
|
|
|
|
|
self.assertIn('ASCII', str(re.A))
|
|
|
|
|
self.assertIn('DOTALL', str(re.S))
|
|
|
|
|
|
2016-11-21 11:35:08 -04:00
|
|
|
|
def test_pattern_compare(self):
|
|
|
|
|
pattern1 = re.compile('abc', re.IGNORECASE)
|
|
|
|
|
|
2016-11-22 10:30:38 -04:00
|
|
|
|
# equal to itself
|
|
|
|
|
self.assertEqual(pattern1, pattern1)
|
|
|
|
|
self.assertFalse(pattern1 != pattern1)
|
|
|
|
|
|
2016-11-21 11:35:08 -04:00
|
|
|
|
# equal
|
|
|
|
|
re.purge()
|
|
|
|
|
pattern2 = re.compile('abc', re.IGNORECASE)
|
|
|
|
|
self.assertEqual(hash(pattern2), hash(pattern1))
|
|
|
|
|
self.assertEqual(pattern2, pattern1)
|
|
|
|
|
|
|
|
|
|
# not equal: different pattern
|
|
|
|
|
re.purge()
|
|
|
|
|
pattern3 = re.compile('XYZ', re.IGNORECASE)
|
|
|
|
|
# Don't test hash(pattern3) != hash(pattern1) because there is no
|
|
|
|
|
# warranty that hash values are different
|
|
|
|
|
self.assertNotEqual(pattern3, pattern1)
|
|
|
|
|
|
|
|
|
|
# not equal: different flag (flags=0)
|
|
|
|
|
re.purge()
|
|
|
|
|
pattern4 = re.compile('abc')
|
|
|
|
|
self.assertNotEqual(pattern4, pattern1)
|
|
|
|
|
|
|
|
|
|
# only == and != comparison operators are supported
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
pattern1 < pattern2
|
|
|
|
|
|
|
|
|
|
def test_pattern_compare_bytes(self):
|
|
|
|
|
pattern1 = re.compile(b'abc')
|
|
|
|
|
|
|
|
|
|
# equal: test bytes patterns
|
|
|
|
|
re.purge()
|
|
|
|
|
pattern2 = re.compile(b'abc')
|
|
|
|
|
self.assertEqual(hash(pattern2), hash(pattern1))
|
|
|
|
|
self.assertEqual(pattern2, pattern1)
|
|
|
|
|
|
|
|
|
|
# not equal: pattern of a different types (str vs bytes),
|
|
|
|
|
# comparison must not raise a BytesWarning
|
|
|
|
|
re.purge()
|
|
|
|
|
pattern3 = re.compile('abc')
|
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
|
warnings.simplefilter('error', BytesWarning)
|
|
|
|
|
self.assertNotEqual(pattern3, pattern1)
|
|
|
|
|
|
2017-02-04 16:53:57 -04:00
|
|
|
|
def test_bug_29444(self):
|
|
|
|
|
s = bytearray(b'abcdefgh')
|
|
|
|
|
m = re.search(b'[a-h]+', s)
|
|
|
|
|
m2 = re.search(b'[e-h]+', s)
|
|
|
|
|
self.assertEqual(m.group(), b'abcdefgh')
|
|
|
|
|
self.assertEqual(m2.group(), b'efgh')
|
|
|
|
|
s[:] = b'xyz'
|
|
|
|
|
self.assertEqual(m.group(), b'xyz')
|
|
|
|
|
self.assertEqual(m2.group(), b'')
|
|
|
|
|
|
2019-02-18 09:26:37 -04:00
|
|
|
|
def test_bug_34294(self):
|
|
|
|
|
# Issue 34294: wrong capturing groups
|
|
|
|
|
|
|
|
|
|
# exists since Python 2
|
|
|
|
|
s = "a\tx"
|
|
|
|
|
p = r"\b(?=(\t)|(x))x"
|
|
|
|
|
self.assertEqual(re.search(p, s).groups(), (None, 'x'))
|
|
|
|
|
|
|
|
|
|
# introduced in Python 3.7.0
|
|
|
|
|
s = "ab"
|
|
|
|
|
p = r"(?=(.)(.)?)"
|
|
|
|
|
self.assertEqual(re.findall(p, s),
|
|
|
|
|
[('a', 'b'), ('b', '')])
|
|
|
|
|
self.assertEqual([m.groups() for m in re.finditer(p, s)],
|
|
|
|
|
[('a', 'b'), ('b', None)])
|
|
|
|
|
|
|
|
|
|
# test-cases provided by issue34294, introduced in Python 3.7.0
|
|
|
|
|
p = r"(?=<(?P<tag>\w+)/?>(?:(?P<text>.+?)</(?P=tag)>)?)"
|
|
|
|
|
s = "<test><foo2/></test>"
|
|
|
|
|
self.assertEqual(re.findall(p, s),
|
|
|
|
|
[('test', '<foo2/>'), ('foo2', '')])
|
|
|
|
|
self.assertEqual([m.groupdict() for m in re.finditer(p, s)],
|
|
|
|
|
[{'tag': 'test', 'text': '<foo2/>'},
|
|
|
|
|
{'tag': 'foo2', 'text': None}])
|
|
|
|
|
s = "<test>Hello</test><foo/>"
|
|
|
|
|
self.assertEqual([m.groupdict() for m in re.finditer(p, s)],
|
|
|
|
|
[{'tag': 'test', 'text': 'Hello'},
|
|
|
|
|
{'tag': 'foo', 'text': None}])
|
|
|
|
|
s = "<test>Hello</test><foo/><foo/>"
|
|
|
|
|
self.assertEqual([m.groupdict() for m in re.finditer(p, s)],
|
|
|
|
|
[{'tag': 'test', 'text': 'Hello'},
|
|
|
|
|
{'tag': 'foo', 'text': None},
|
|
|
|
|
{'tag': 'foo', 'text': None}])
|
|
|
|
|
|
2022-03-29 11:31:01 -03:00
|
|
|
|
def test_MARK_PUSH_macro_bug(self):
|
|
|
|
|
# issue35859, MARK_PUSH() macro didn't protect MARK-0 if it
|
|
|
|
|
# was the only available mark.
|
|
|
|
|
self.assertEqual(re.match(r'(ab|a)*?b', 'ab').groups(), ('a',))
|
|
|
|
|
self.assertEqual(re.match(r'(ab|a)+?b', 'ab').groups(), ('a',))
|
|
|
|
|
self.assertEqual(re.match(r'(ab|a){0,2}?b', 'ab').groups(), ('a',))
|
|
|
|
|
self.assertEqual(re.match(r'(.b|a)*?b', 'ab').groups(), ('a',))
|
|
|
|
|
|
|
|
|
|
def test_MIN_UNTIL_mark_bug(self):
|
|
|
|
|
# Fixed in issue35859, reported in issue9134.
|
|
|
|
|
# JUMP_MIN_UNTIL_2 should MARK_PUSH() if in a repeat
|
|
|
|
|
s = 'axxzbcz'
|
|
|
|
|
p = r'(?:(?:a|bc)*?(xx)??z)*'
|
|
|
|
|
self.assertEqual(re.match(p, s).groups(), ('xx',))
|
|
|
|
|
|
|
|
|
|
# test-case provided by issue9134
|
|
|
|
|
s = 'xtcxyzxc'
|
|
|
|
|
p = r'((x|yz)+?(t)??c)*'
|
|
|
|
|
m = re.match(p, s)
|
|
|
|
|
self.assertEqual(m.span(), (0, 8))
|
|
|
|
|
self.assertEqual(m.span(2), (6, 7))
|
|
|
|
|
self.assertEqual(m.groups(), ('xyzxc', 'x', 't'))
|
|
|
|
|
|
|
|
|
|
def test_REPEAT_ONE_mark_bug(self):
|
|
|
|
|
# issue35859
|
|
|
|
|
# JUMP_REPEAT_ONE_1 should MARK_PUSH() if in a repeat
|
|
|
|
|
s = 'aabaab'
|
|
|
|
|
p = r'(?:[^b]*a(?=(b)|(a))ab)*'
|
|
|
|
|
m = re.match(p, s)
|
|
|
|
|
self.assertEqual(m.span(), (0, 6))
|
|
|
|
|
self.assertEqual(m.span(2), (4, 5))
|
|
|
|
|
self.assertEqual(m.groups(), (None, 'a'))
|
|
|
|
|
|
|
|
|
|
# JUMP_REPEAT_ONE_2 should MARK_PUSH() if in a repeat
|
|
|
|
|
s = 'abab'
|
|
|
|
|
p = r'(?:[^b]*(?=(b)|(a))ab)*'
|
|
|
|
|
m = re.match(p, s)
|
|
|
|
|
self.assertEqual(m.span(), (0, 4))
|
|
|
|
|
self.assertEqual(m.span(2), (2, 3))
|
|
|
|
|
self.assertEqual(m.groups(), (None, 'a'))
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.match(r'(ab?)*?b', 'ab').groups(), ('a',))
|
|
|
|
|
|
|
|
|
|
def test_MIN_REPEAT_ONE_mark_bug(self):
|
|
|
|
|
# issue35859
|
|
|
|
|
# JUMP_MIN_REPEAT_ONE should MARK_PUSH() if in a repeat
|
|
|
|
|
s = 'abab'
|
|
|
|
|
p = r'(?:.*?(?=(a)|(b))b)*'
|
|
|
|
|
m = re.match(p, s)
|
|
|
|
|
self.assertEqual(m.span(), (0, 4))
|
|
|
|
|
self.assertEqual(m.span(2), (3, 4))
|
|
|
|
|
self.assertEqual(m.groups(), (None, 'b'))
|
|
|
|
|
|
|
|
|
|
s = 'axxzaz'
|
|
|
|
|
p = r'(?:a*?(xx)??z)*'
|
|
|
|
|
self.assertEqual(re.match(p, s).groups(), ('xx',))
|
|
|
|
|
|
|
|
|
|
def test_ASSERT_NOT_mark_bug(self):
|
|
|
|
|
# Fixed in issue35859, reported in issue725149.
|
|
|
|
|
# JUMP_ASSERT_NOT should LASTMARK_SAVE()
|
|
|
|
|
self.assertEqual(re.match(r'(?!(..)c)', 'ab').groups(), (None,))
|
|
|
|
|
|
|
|
|
|
# JUMP_ASSERT_NOT should MARK_PUSH() if in a repeat
|
|
|
|
|
m = re.match(r'((?!(ab)c)(.))*', 'abab')
|
|
|
|
|
self.assertEqual(m.span(), (0, 4))
|
|
|
|
|
self.assertEqual(m.span(1), (3, 4))
|
|
|
|
|
self.assertEqual(m.span(3), (3, 4))
|
|
|
|
|
self.assertEqual(m.groups(), ('b', None, 'b'))
|
|
|
|
|
|
2021-05-21 18:02:42 -03:00
|
|
|
|
def test_bug_40736(self):
|
|
|
|
|
with self.assertRaisesRegex(TypeError, "got 'int'"):
|
|
|
|
|
re.search("x*", 5)
|
|
|
|
|
with self.assertRaisesRegex(TypeError, "got 'type'"):
|
|
|
|
|
re.search("x*", type)
|
|
|
|
|
|
2022-03-22 12:27:55 -03:00
|
|
|
|
def test_search_anchor_at_beginning(self):
|
|
|
|
|
s = 'x'*10**7
|
|
|
|
|
start = time.perf_counter()
|
|
|
|
|
for p in r'\Ay', r'^y':
|
|
|
|
|
self.assertIsNone(re.search(p, s))
|
|
|
|
|
self.assertEqual(re.split(p, s), [s])
|
|
|
|
|
self.assertEqual(re.findall(p, s), [])
|
|
|
|
|
self.assertEqual(list(re.finditer(p, s)), [])
|
|
|
|
|
self.assertEqual(re.sub(p, '', s), s)
|
|
|
|
|
t = time.perf_counter() - start
|
|
|
|
|
# Without optimization it takes 1 second on my computer.
|
|
|
|
|
# With optimization -- 0.0003 seconds.
|
|
|
|
|
self.assertLess(t, 0.1)
|
|
|
|
|
|
2022-03-22 06:44:47 -03:00
|
|
|
|
def test_possessive_quantifiers(self):
|
|
|
|
|
"""Test Possessive Quantifiers
|
|
|
|
|
Test quantifiers of the form @+ for some repetition operator @,
|
2022-03-21 13:28:22 -03:00
|
|
|
|
e.g. x{3,5}+ meaning match from 3 to 5 greadily and proceed
|
|
|
|
|
without creating a stack frame for rolling the stack back and
|
|
|
|
|
trying 1 or more fewer matches."""
|
|
|
|
|
self.assertIsNone(re.match('e*+e', 'eeee'))
|
|
|
|
|
self.assertEqual(re.match('e++a', 'eeea').group(0), 'eeea')
|
|
|
|
|
self.assertEqual(re.match('e?+a', 'ea').group(0), 'ea')
|
|
|
|
|
self.assertEqual(re.match('e{2,4}+a', 'eeea').group(0), 'eeea')
|
|
|
|
|
self.assertIsNone(re.match('(.)++.', 'ee'))
|
|
|
|
|
self.assertEqual(re.match('(ae)*+a', 'aea').groups(), ('ae',))
|
|
|
|
|
self.assertEqual(re.match('([ae][ae])?+a', 'aea').groups(),
|
|
|
|
|
('ae',))
|
|
|
|
|
self.assertEqual(re.match('(e?){2,4}+a', 'eeea').groups(),
|
|
|
|
|
('',))
|
|
|
|
|
self.assertEqual(re.match('()*+a', 'a').groups(), ('',))
|
|
|
|
|
self.assertEqual(re.search('x*+', 'axx').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.search('x++', 'axx').span(), (1, 3))
|
|
|
|
|
self.assertEqual(re.match('a*+', 'xxx').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match('x*+', 'xxxa').span(), (0, 3))
|
|
|
|
|
self.assertIsNone(re.match('a++', 'xxx'))
|
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1}+$", "abc"))
|
|
|
|
|
self.assertIsNone(re.match(r"^(\w){1,2}+$", "abc"))
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){3}+$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,3}+$", "abc").group(1), "c")
|
|
|
|
|
self.assertEqual(re.match(r"^(\w){1,4}+$", "abc").group(1), "c")
|
|
|
|
|
|
|
|
|
|
self.assertIsNone(re.match("^x{1}+$", "xxx"))
|
|
|
|
|
self.assertIsNone(re.match("^x{1,2}+$", "xxx"))
|
|
|
|
|
|
|
|
|
|
self.assertTrue(re.match("^x{3}+$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match("^x{1,3}+$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match("^x{1,4}+$", "xxx"))
|
|
|
|
|
|
|
|
|
|
self.assertIsNone(re.match("^x{}+$", "xxx"))
|
|
|
|
|
self.assertTrue(re.match("^x{}+$", "x{}"))
|
|
|
|
|
|
2022-03-22 06:44:47 -03:00
|
|
|
|
def test_fullmatch_possessive_quantifiers(self):
|
2022-03-21 13:28:22 -03:00
|
|
|
|
self.assertTrue(re.fullmatch(r'a++', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a*+', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a?+', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a{1,3}+', 'a'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'a++', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'a*+', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'a?+', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'a{1,3}+', 'ab'))
|
2022-04-19 11:49:36 -03:00
|
|
|
|
self.assertTrue(re.fullmatch(r'a++b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a*+b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a?+b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'a{1,3}+b', 'ab'))
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)++', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)*+', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)?+', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab){1,3}+', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?:ab)++', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?:ab)*+', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?:ab)?+', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?:ab){1,3}+', 'abc'))
|
2022-04-19 11:49:36 -03:00
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)++c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)*+c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab)?+c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?:ab){1,3}+c', 'abc'))
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
2022-03-22 06:44:47 -03:00
|
|
|
|
def test_findall_possessive_quantifiers(self):
|
2022-03-21 13:28:22 -03:00
|
|
|
|
self.assertEqual(re.findall(r'a++', 'aab'), ['aa'])
|
|
|
|
|
self.assertEqual(re.findall(r'a*+', 'aab'), ['aa', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'a?+', 'aab'), ['a', 'a', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'a{1,3}+', 'aab'), ['aa'])
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.findall(r'(?:ab)++', 'ababc'), ['abab'])
|
|
|
|
|
self.assertEqual(re.findall(r'(?:ab)*+', 'ababc'), ['abab', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?:ab)?+', 'ababc'), ['ab', 'ab', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?:ab){1,3}+', 'ababc'), ['abab'])
|
|
|
|
|
|
|
|
|
|
def test_atomic_grouping(self):
|
|
|
|
|
"""Test Atomic Grouping
|
|
|
|
|
Test non-capturing groups of the form (?>...), which does
|
|
|
|
|
not maintain any stack point created within the group once the
|
|
|
|
|
group is finished being evaluated."""
|
|
|
|
|
pattern1 = re.compile(r'a(?>bc|b)c')
|
|
|
|
|
self.assertIsNone(pattern1.match('abc'))
|
|
|
|
|
self.assertTrue(pattern1.match('abcc'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?>.*).', 'abc'))
|
|
|
|
|
self.assertTrue(re.match(r'(?>x)++', 'xxx'))
|
|
|
|
|
self.assertTrue(re.match(r'(?>x++)', 'xxx'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?>x)++x', 'xxx'))
|
|
|
|
|
self.assertIsNone(re.match(r'(?>x++)x', 'xxx'))
|
|
|
|
|
|
|
|
|
|
def test_fullmatch_atomic_grouping(self):
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a+)', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a*)', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a?)', 'a'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a{1,3})', 'a'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>a+)', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>a*)', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>a?)', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>a{1,3})', 'ab'))
|
2022-04-19 11:49:36 -03:00
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a+)b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a*)b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a?)b', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>a{1,3})b', 'ab'))
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)+)', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)*)', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)?)', 'ab'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab){1,3})', 'ab'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>(?:ab)+)', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>(?:ab)*)', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>(?:ab)?)', 'abc'))
|
|
|
|
|
self.assertIsNone(re.fullmatch(r'(?>(?:ab){1,3})', 'abc'))
|
2022-04-19 11:49:36 -03:00
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)+)c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)*)c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab)?)c', 'abc'))
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?>(?:ab){1,3})c', 'abc'))
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
|
|
|
|
def test_findall_atomic_grouping(self):
|
|
|
|
|
self.assertEqual(re.findall(r'(?>a+)', 'aab'), ['aa'])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>a*)', 'aab'), ['aa', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>a?)', 'aab'), ['a', 'a', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>a{1,3})', 'aab'), ['aa'])
|
|
|
|
|
|
|
|
|
|
self.assertEqual(re.findall(r'(?>(?:ab)+)', 'ababc'), ['abab'])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>(?:ab)*)', 'ababc'), ['abab', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>(?:ab)?)', 'ababc'), ['ab', 'ab', '', ''])
|
|
|
|
|
self.assertEqual(re.findall(r'(?>(?:ab){1,3})', 'ababc'), ['abab'])
|
|
|
|
|
|
2022-04-19 11:49:36 -03:00
|
|
|
|
def test_bug_gh91616(self):
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?s:(?>.*?\.).*)\Z', "a.txt")) # reproducer
|
|
|
|
|
self.assertTrue(re.fullmatch(r'(?s:(?=(?P<g0>.*?\.))(?P=g0).*)\Z', "a.txt"))
|
|
|
|
|
|
2023-08-16 04:43:45 -03:00
|
|
|
|
def test_bug_gh100061(self):
|
|
|
|
|
# gh-100061
|
|
|
|
|
self.assertEqual(re.match('(?>(?:.(?!D))+)', 'ABCDE').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(?:.(?!D))++', 'ABCDE').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(?>(?:.(?!D))*)', 'ABCDE').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(?:.(?!D))*+', 'ABCDE').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(?>(?:.(?!D))?)', 'CDE').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match('(?:.(?!D))?+', 'CDE').span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match('(?>(?:.(?!D)){1,3})', 'ABCDE').span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match('(?:.(?!D)){1,3}+', 'ABCDE').span(), (0, 2))
|
|
|
|
|
# gh-106052
|
2023-08-09 02:47:57 -03:00
|
|
|
|
self.assertEqual(re.match("(?>(?:ab?c)+)", "aca").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match("(?:ab?c)++", "aca").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match("(?>(?:ab?c)*)", "aca").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match("(?:ab?c)*+", "aca").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match("(?>(?:ab?c)?)", "a").span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match("(?:ab?c)?+", "a").span(), (0, 0))
|
|
|
|
|
self.assertEqual(re.match("(?>(?:ab?c){1,3})", "aca").span(), (0, 2))
|
|
|
|
|
self.assertEqual(re.match("(?:ab?c){1,3}+", "aca").span(), (0, 2))
|
|
|
|
|
|
2022-08-03 20:19:36 -03:00
|
|
|
|
@unittest.skipIf(multiprocessing is None, 'test requires multiprocessing')
|
|
|
|
|
def test_regression_gh94675(self):
|
|
|
|
|
pattern = re.compile(r'(?<=[({}])(((//[^\n]*)?[\n])([\000-\040])*)*'
|
|
|
|
|
r'((/[^/\[\n]*(([^\n]|(\[\n]*(]*)*\]))'
|
|
|
|
|
r'[^/\[]*)*/))((((//[^\n]*)?[\n])'
|
|
|
|
|
r'([\000-\040]|(/\*[^*]*\*+'
|
|
|
|
|
r'([^/*]\*+)*/))*)+(?=[^\000-\040);\]}]))')
|
|
|
|
|
input_js = '''a(function() {
|
|
|
|
|
///////////////////////////////////////////////////////////////////
|
|
|
|
|
});'''
|
2023-02-03 19:20:46 -04:00
|
|
|
|
p = multiprocessing.Process(target=pattern.sub, args=('', input_js))
|
2022-08-03 20:19:36 -03:00
|
|
|
|
p.start()
|
|
|
|
|
p.join(SHORT_TIMEOUT)
|
|
|
|
|
try:
|
|
|
|
|
self.assertFalse(p.is_alive(), 'pattern.sub() timed out')
|
|
|
|
|
finally:
|
|
|
|
|
if p.is_alive():
|
|
|
|
|
p.terminate()
|
|
|
|
|
p.join()
|
|
|
|
|
|
2023-08-07 12:09:56 -03:00
|
|
|
|
def test_fail(self):
|
|
|
|
|
self.assertEqual(re.search(r'12(?!)|3', '123')[0], '3')
|
|
|
|
|
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
|
|
|
|
def get_debug_out(pat):
|
|
|
|
|
with captured_stdout() as out:
|
|
|
|
|
re.compile(pat, re.DEBUG)
|
|
|
|
|
return out.getvalue()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@cpython_only
|
|
|
|
|
class DebugTests(unittest.TestCase):
|
|
|
|
|
maxDiff = None
|
|
|
|
|
|
|
|
|
|
def test_debug_flag(self):
|
|
|
|
|
pat = r'(\.)(?:[ch]|py)(?(1)$|: )'
|
|
|
|
|
dump = '''\
|
|
|
|
|
SUBPATTERN 1 0 0
|
|
|
|
|
LITERAL 46
|
|
|
|
|
BRANCH
|
|
|
|
|
IN
|
|
|
|
|
LITERAL 99
|
|
|
|
|
LITERAL 104
|
|
|
|
|
OR
|
|
|
|
|
LITERAL 112
|
|
|
|
|
LITERAL 121
|
|
|
|
|
GROUPREF_EXISTS 1
|
|
|
|
|
AT AT_END
|
|
|
|
|
ELSE
|
|
|
|
|
LITERAL 58
|
|
|
|
|
LITERAL 32
|
|
|
|
|
|
|
|
|
|
0. INFO 8 0b1 2 5 (to 9)
|
|
|
|
|
prefix_skip 0
|
|
|
|
|
prefix [0x2e] ('.')
|
|
|
|
|
overlap [0]
|
|
|
|
|
9: MARK 0
|
|
|
|
|
11. LITERAL 0x2e ('.')
|
|
|
|
|
13. MARK 1
|
|
|
|
|
15. BRANCH 10 (to 26)
|
|
|
|
|
17. IN 6 (to 24)
|
|
|
|
|
19. LITERAL 0x63 ('c')
|
|
|
|
|
21. LITERAL 0x68 ('h')
|
|
|
|
|
23. FAILURE
|
|
|
|
|
24: JUMP 9 (to 34)
|
|
|
|
|
26: branch 7 (to 33)
|
|
|
|
|
27. LITERAL 0x70 ('p')
|
|
|
|
|
29. LITERAL 0x79 ('y')
|
|
|
|
|
31. JUMP 2 (to 34)
|
|
|
|
|
33: FAILURE
|
|
|
|
|
34: GROUPREF_EXISTS 0 6 (to 41)
|
|
|
|
|
37. AT END
|
|
|
|
|
39. JUMP 5 (to 45)
|
|
|
|
|
41: LITERAL 0x3a (':')
|
|
|
|
|
43. LITERAL 0x20 (' ')
|
|
|
|
|
45: SUCCESS
|
|
|
|
|
'''
|
|
|
|
|
self.assertEqual(get_debug_out(pat), dump)
|
|
|
|
|
# Debug output is output again even a second time (bypassing
|
|
|
|
|
# the cache -- issue #20426).
|
|
|
|
|
self.assertEqual(get_debug_out(pat), dump)
|
|
|
|
|
|
|
|
|
|
def test_atomic_group(self):
|
|
|
|
|
self.assertEqual(get_debug_out(r'(?>ab?)'), '''\
|
2023-07-08 08:31:25 -03:00
|
|
|
|
ATOMIC_GROUP
|
|
|
|
|
LITERAL 97
|
|
|
|
|
MAX_REPEAT 0 1
|
|
|
|
|
LITERAL 98
|
2022-03-21 13:28:22 -03:00
|
|
|
|
|
|
|
|
|
0. INFO 4 0b0 1 2 (to 5)
|
|
|
|
|
5: ATOMIC_GROUP 11 (to 17)
|
|
|
|
|
7. LITERAL 0x61 ('a')
|
|
|
|
|
9. REPEAT_ONE 6 0 1 (to 16)
|
|
|
|
|
13. LITERAL 0x62 ('b')
|
|
|
|
|
15. SUCCESS
|
|
|
|
|
16: SUCCESS
|
|
|
|
|
17: SUCCESS
|
|
|
|
|
''')
|
|
|
|
|
|
|
|
|
|
def test_possesive_repeat_one(self):
|
|
|
|
|
self.assertEqual(get_debug_out(r'a?+'), '''\
|
|
|
|
|
POSSESSIVE_REPEAT 0 1
|
|
|
|
|
LITERAL 97
|
|
|
|
|
|
|
|
|
|
0. INFO 4 0b0 0 1 (to 5)
|
|
|
|
|
5: POSSESSIVE_REPEAT_ONE 6 0 1 (to 12)
|
|
|
|
|
9. LITERAL 0x61 ('a')
|
|
|
|
|
11. SUCCESS
|
|
|
|
|
12: SUCCESS
|
|
|
|
|
''')
|
|
|
|
|
|
|
|
|
|
def test_possesive_repeat(self):
|
|
|
|
|
self.assertEqual(get_debug_out(r'(?:ab)?+'), '''\
|
|
|
|
|
POSSESSIVE_REPEAT 0 1
|
|
|
|
|
LITERAL 97
|
|
|
|
|
LITERAL 98
|
|
|
|
|
|
|
|
|
|
0. INFO 4 0b0 0 2 (to 5)
|
|
|
|
|
5: POSSESSIVE_REPEAT 7 0 1 (to 13)
|
|
|
|
|
9. LITERAL 0x61 ('a')
|
|
|
|
|
11. LITERAL 0x62 ('b')
|
|
|
|
|
13: SUCCESS
|
|
|
|
|
14. SUCCESS
|
|
|
|
|
''')
|
|
|
|
|
|
2013-10-25 16:36:10 -03:00
|
|
|
|
|
2013-11-23 16:42:43 -04:00
|
|
|
|
class PatternReprTests(unittest.TestCase):
|
|
|
|
|
def check(self, pattern, expected):
|
|
|
|
|
self.assertEqual(repr(re.compile(pattern)), expected)
|
|
|
|
|
|
|
|
|
|
def check_flags(self, pattern, flags, expected):
|
|
|
|
|
self.assertEqual(repr(re.compile(pattern, flags)), expected)
|
|
|
|
|
|
|
|
|
|
def test_without_flags(self):
|
|
|
|
|
self.check('random pattern',
|
|
|
|
|
"re.compile('random pattern')")
|
|
|
|
|
|
|
|
|
|
def test_single_flag(self):
|
|
|
|
|
self.check_flags('random pattern', re.IGNORECASE,
|
|
|
|
|
"re.compile('random pattern', re.IGNORECASE)")
|
|
|
|
|
|
|
|
|
|
def test_multiple_flags(self):
|
|
|
|
|
self.check_flags('random pattern', re.I|re.S|re.X,
|
|
|
|
|
"re.compile('random pattern', "
|
|
|
|
|
"re.IGNORECASE|re.DOTALL|re.VERBOSE)")
|
|
|
|
|
|
|
|
|
|
def test_unicode_flag(self):
|
|
|
|
|
self.check_flags('random pattern', re.U,
|
|
|
|
|
"re.compile('random pattern')")
|
|
|
|
|
self.check_flags('random pattern', re.I|re.S|re.U,
|
|
|
|
|
"re.compile('random pattern', "
|
|
|
|
|
"re.IGNORECASE|re.DOTALL)")
|
|
|
|
|
|
|
|
|
|
def test_inline_flags(self):
|
|
|
|
|
self.check('(?i)pattern',
|
|
|
|
|
"re.compile('(?i)pattern', re.IGNORECASE)")
|
|
|
|
|
|
|
|
|
|
def test_unknown_flags(self):
|
|
|
|
|
self.check_flags('random pattern', 0x123000,
|
|
|
|
|
"re.compile('random pattern', 0x123000)")
|
|
|
|
|
self.check_flags('random pattern', 0x123000|re.I,
|
|
|
|
|
"re.compile('random pattern', re.IGNORECASE|0x123000)")
|
|
|
|
|
|
|
|
|
|
def test_bytes(self):
|
|
|
|
|
self.check(b'bytes pattern',
|
|
|
|
|
"re.compile(b'bytes pattern')")
|
|
|
|
|
self.check_flags(b'bytes pattern', re.A,
|
|
|
|
|
"re.compile(b'bytes pattern', re.ASCII)")
|
|
|
|
|
|
2014-12-01 05:50:07 -04:00
|
|
|
|
def test_locale(self):
|
|
|
|
|
self.check_flags(b'bytes pattern', re.L,
|
|
|
|
|
"re.compile(b'bytes pattern', re.LOCALE)")
|
|
|
|
|
|
2013-11-23 16:42:43 -04:00
|
|
|
|
def test_quotes(self):
|
|
|
|
|
self.check('random "double quoted" pattern',
|
|
|
|
|
'''re.compile('random "double quoted" pattern')''')
|
|
|
|
|
self.check("random 'single quoted' pattern",
|
|
|
|
|
'''re.compile("random 'single quoted' pattern")''')
|
|
|
|
|
self.check('''both 'single' and "double" quotes''',
|
|
|
|
|
'''re.compile('both \\'single\\' and "double" quotes')''')
|
|
|
|
|
|
|
|
|
|
def test_long_pattern(self):
|
|
|
|
|
pattern = 'Very %spattern' % ('long ' * 1000)
|
|
|
|
|
r = repr(re.compile(pattern))
|
|
|
|
|
self.assertLess(len(r), 300)
|
|
|
|
|
self.assertEqual(r[:30], "re.compile('Very long long lon")
|
|
|
|
|
r = repr(re.compile(pattern, re.I))
|
|
|
|
|
self.assertLess(len(r), 300)
|
|
|
|
|
self.assertEqual(r[:30], "re.compile('Very long long lon")
|
|
|
|
|
self.assertEqual(r[-16:], ", re.IGNORECASE)")
|
|
|
|
|
|
2019-05-31 04:39:47 -03:00
|
|
|
|
def test_flags_repr(self):
|
|
|
|
|
self.assertEqual(repr(re.I), "re.IGNORECASE")
|
|
|
|
|
self.assertEqual(repr(re.I|re.S|re.X),
|
|
|
|
|
"re.IGNORECASE|re.DOTALL|re.VERBOSE")
|
|
|
|
|
self.assertEqual(repr(re.I|re.S|re.X|(1<<20)),
|
|
|
|
|
"re.IGNORECASE|re.DOTALL|re.VERBOSE|0x100000")
|
bpo-38250: [Enum] single-bit flags are canonical (GH-24215)
Flag members are now divided by one-bit verses multi-bit, with multi-bit being treated as aliases. Iterating over a flag only returns the contained single-bit flags.
Iterating, repr(), and str() show members in definition order.
When constructing combined-member flags, any extra integer values are either discarded (CONFORM), turned into ints (EJECT) or treated as errors (STRICT). Flag classes can specify which of those three behaviors is desired:
>>> class Test(Flag, boundary=CONFORM):
... ONE = 1
... TWO = 2
...
>>> Test(5)
<Test.ONE: 1>
Besides the three above behaviors, there is also KEEP, which should not be used unless necessary -- for example, _convert_ specifies KEEP as there are flag sets in the stdlib that are incomplete and/or inconsistent (e.g. ssl.Options). KEEP will, as the name suggests, keep all bits; however, iterating over a flag with extra bits will only return the canonical flags contained, not the extra bits.
Iteration is now in member definition order. If member definition order
matches increasing value order, then a more efficient method of flag
decomposition is used; otherwise, sort() is called on the results of
that method to get definition order.
``re`` module:
repr() has been modified to support as closely as possible its previous
output; the big difference is that inverted flags cannot be output as
before because the inversion operation now always returns the comparable
positive result; i.e.
re.A|re.I|re.M|re.S is ~(re.L|re.U|re.S|re.T|re.DEBUG)
in both of the above terms, the ``value`` is 282.
re's tests have been updated to reflect the modifications to repr().
2021-01-25 18:26:19 -04:00
|
|
|
|
self.assertEqual(
|
|
|
|
|
repr(~re.I),
|
2023-06-14 07:26:20 -03:00
|
|
|
|
"re.ASCII|re.LOCALE|re.UNICODE|re.MULTILINE|re.DOTALL|re.VERBOSE|re.DEBUG|0x1")
|
2019-05-31 04:39:47 -03:00
|
|
|
|
self.assertEqual(repr(~(re.I|re.S|re.X)),
|
2023-06-14 07:26:20 -03:00
|
|
|
|
"re.ASCII|re.LOCALE|re.UNICODE|re.MULTILINE|re.DEBUG|0x1")
|
2019-05-31 04:39:47 -03:00
|
|
|
|
self.assertEqual(repr(~(re.I|re.S|re.X|(1<<20))),
|
2023-06-14 07:26:20 -03:00
|
|
|
|
"re.ASCII|re.LOCALE|re.UNICODE|re.MULTILINE|re.DEBUG|0xffe01")
|
2019-05-31 04:39:47 -03:00
|
|
|
|
|
2013-11-23 16:42:43 -04:00
|
|
|
|
|
2013-10-25 16:36:10 -03:00
|
|
|
|
class ImplementationTest(unittest.TestCase):
|
|
|
|
|
"""
|
|
|
|
|
Test implementation details of the re module.
|
|
|
|
|
"""
|
|
|
|
|
|
2021-04-29 03:47:11 -03:00
|
|
|
|
@cpython_only
|
|
|
|
|
def test_immutable(self):
|
|
|
|
|
# bpo-43908: check that re types are immutable
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
re.Match.foo = 1
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
re.Pattern.foo = 1
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
pat = re.compile("")
|
|
|
|
|
tp = type(pat.scanner(""))
|
|
|
|
|
tp.foo = 1
|
|
|
|
|
|
2013-10-25 16:36:10 -03:00
|
|
|
|
def test_overlap_table(self):
|
2022-04-02 05:35:13 -03:00
|
|
|
|
f = re._compiler._generate_overlap_table
|
2013-10-25 16:36:10 -03:00
|
|
|
|
self.assertEqual(f(""), [])
|
|
|
|
|
self.assertEqual(f("a"), [0])
|
|
|
|
|
self.assertEqual(f("abcd"), [0, 0, 0, 0])
|
|
|
|
|
self.assertEqual(f("aaaa"), [0, 1, 2, 3])
|
|
|
|
|
self.assertEqual(f("ababba"), [0, 0, 1, 2, 0, 1])
|
|
|
|
|
self.assertEqual(f("abcabdac"), [0, 0, 0, 1, 2, 0, 1, 0])
|
|
|
|
|
|
2020-11-20 08:36:23 -04:00
|
|
|
|
def test_signedness(self):
|
2022-04-02 05:35:13 -03:00
|
|
|
|
self.assertGreaterEqual(re._compiler.MAXREPEAT, 0)
|
|
|
|
|
self.assertGreaterEqual(re._compiler.MAXGROUPS, 0)
|
2020-11-20 08:36:23 -04:00
|
|
|
|
|
2021-04-30 11:04:57 -03:00
|
|
|
|
@cpython_only
|
|
|
|
|
def test_disallow_instantiation(self):
|
|
|
|
|
# Ensure that the type disallows instantiation (bpo-43916)
|
2021-05-27 03:43:52 -03:00
|
|
|
|
check_disallow_instantiation(self, re.Match)
|
|
|
|
|
check_disallow_instantiation(self, re.Pattern)
|
2021-04-30 11:04:57 -03:00
|
|
|
|
pat = re.compile("")
|
2021-05-27 03:43:52 -03:00
|
|
|
|
check_disallow_instantiation(self, type(pat.scanner("")))
|
2021-04-30 11:04:57 -03:00
|
|
|
|
|
2022-04-02 05:35:13 -03:00
|
|
|
|
def test_deprecated_modules(self):
|
|
|
|
|
deprecated = {
|
|
|
|
|
'sre_compile': ['compile', 'error',
|
|
|
|
|
'SRE_FLAG_IGNORECASE', 'SUBPATTERN',
|
|
|
|
|
'_compile_info'],
|
|
|
|
|
'sre_constants': ['error', 'SRE_FLAG_IGNORECASE', 'SUBPATTERN',
|
|
|
|
|
'_NamedIntConstant'],
|
|
|
|
|
'sre_parse': ['SubPattern', 'parse',
|
|
|
|
|
'SRE_FLAG_IGNORECASE', 'SUBPATTERN',
|
|
|
|
|
'_parse_sub'],
|
|
|
|
|
}
|
|
|
|
|
for name in deprecated:
|
|
|
|
|
with self.subTest(module=name):
|
|
|
|
|
sys.modules.pop(name, None)
|
2022-04-24 04:23:59 -03:00
|
|
|
|
with self.assertWarns(DeprecationWarning) as w:
|
2022-04-02 05:35:13 -03:00
|
|
|
|
__import__(name)
|
2022-04-24 04:23:59 -03:00
|
|
|
|
self.assertEqual(str(w.warning),
|
2022-04-02 05:35:13 -03:00
|
|
|
|
f"module {name!r} is deprecated")
|
2022-04-24 04:23:59 -03:00
|
|
|
|
self.assertEqual(w.filename, __file__)
|
2022-04-02 05:35:13 -03:00
|
|
|
|
self.assertIn(name, sys.modules)
|
|
|
|
|
mod = sys.modules[name]
|
|
|
|
|
self.assertEqual(mod.__name__, name)
|
|
|
|
|
self.assertEqual(mod.__package__, '')
|
|
|
|
|
for attr in deprecated[name]:
|
|
|
|
|
self.assertTrue(hasattr(mod, attr))
|
|
|
|
|
del sys.modules[name]
|
2013-10-25 16:36:10 -03:00
|
|
|
|
|
2023-07-09 06:48:36 -03:00
|
|
|
|
@cpython_only
|
|
|
|
|
def test_case_helpers(self):
|
|
|
|
|
import _sre
|
|
|
|
|
for i in range(128):
|
|
|
|
|
c = chr(i)
|
|
|
|
|
lo = ord(c.lower())
|
|
|
|
|
self.assertEqual(_sre.ascii_tolower(i), lo)
|
|
|
|
|
self.assertEqual(_sre.unicode_tolower(i), lo)
|
|
|
|
|
iscased = c in string.ascii_letters
|
|
|
|
|
self.assertEqual(_sre.ascii_iscased(i), iscased)
|
|
|
|
|
self.assertEqual(_sre.unicode_iscased(i), iscased)
|
|
|
|
|
|
|
|
|
|
for i in list(range(128, 0x1000)) + [0x10400, 0x10428]:
|
|
|
|
|
c = chr(i)
|
|
|
|
|
self.assertEqual(_sre.ascii_tolower(i), i)
|
|
|
|
|
if i != 0x0130:
|
|
|
|
|
self.assertEqual(_sre.unicode_tolower(i), ord(c.lower()))
|
|
|
|
|
iscased = c != c.lower() or c != c.upper()
|
|
|
|
|
self.assertFalse(_sre.ascii_iscased(i))
|
|
|
|
|
self.assertEqual(_sre.unicode_iscased(i),
|
|
|
|
|
c != c.lower() or c != c.upper())
|
|
|
|
|
|
|
|
|
|
self.assertEqual(_sre.ascii_tolower(0x0130), 0x0130)
|
|
|
|
|
self.assertEqual(_sre.unicode_tolower(0x0130), ord('i'))
|
|
|
|
|
self.assertFalse(_sre.ascii_iscased(0x0130))
|
|
|
|
|
self.assertTrue(_sre.unicode_iscased(0x0130))
|
|
|
|
|
|
|
|
|
|
@cpython_only
|
|
|
|
|
def test_dealloc(self):
|
|
|
|
|
# issue 3299: check for segfault in debug build
|
|
|
|
|
import _sre
|
|
|
|
|
# the overflow limit is different on wide and narrow builds and it
|
|
|
|
|
# depends on the definition of SRE_CODE (see sre.h).
|
|
|
|
|
# 2**128 should be big enough to overflow on both. For smaller values
|
|
|
|
|
# a RuntimeError is raised instead of OverflowError.
|
|
|
|
|
long_overflow = 2**128
|
|
|
|
|
self.assertRaises(TypeError, re.finditer, "a", {})
|
|
|
|
|
with self.assertRaises(OverflowError):
|
|
|
|
|
_sre.compile("abc", 0, [long_overflow], 0, {}, ())
|
|
|
|
|
with self.assertRaises(TypeError):
|
|
|
|
|
_sre.compile({}, 0, [], 0, [], [])
|
|
|
|
|
|
|
|
|
|
@cpython_only
|
|
|
|
|
def test_repeat_minmax_overflow_maxrepeat(self):
|
|
|
|
|
try:
|
|
|
|
|
from _sre import MAXREPEAT
|
|
|
|
|
except ImportError:
|
|
|
|
|
self.skipTest('requires _sre.MAXREPEAT constant')
|
|
|
|
|
string = "x" * 100000
|
|
|
|
|
self.assertIsNone(re.match(r".{%d}" % (MAXREPEAT - 1), string))
|
|
|
|
|
self.assertEqual(re.match(r".{,%d}" % (MAXREPEAT - 1), string).span(),
|
|
|
|
|
(0, 100000))
|
|
|
|
|
self.assertIsNone(re.match(r".{%d,}?" % (MAXREPEAT - 1), string))
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{%d}" % MAXREPEAT)
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{,%d}" % MAXREPEAT)
|
|
|
|
|
self.assertRaises(OverflowError, re.compile, r".{%d,}?" % MAXREPEAT)
|
|
|
|
|
|
|
|
|
|
@cpython_only
|
|
|
|
|
def test_sre_template_invalid_group_index(self):
|
|
|
|
|
# see gh-106524
|
|
|
|
|
import _sre
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
|
_sre.template("", ["", -1, ""])
|
|
|
|
|
self.assertIn("invalid template", str(cm.exception))
|
|
|
|
|
with self.assertRaises(TypeError) as cm:
|
|
|
|
|
_sre.template("", ["", (), ""])
|
|
|
|
|
self.assertIn("an integer is required", str(cm.exception))
|
|
|
|
|
|
|
|
|
|
|
2014-12-01 05:06:45 -04:00
|
|
|
|
class ExternalTests(unittest.TestCase):
|
|
|
|
|
|
|
|
|
|
def test_re_benchmarks(self):
|
|
|
|
|
're_tests benchmarks'
|
|
|
|
|
from test.re_tests import benchmarks
|
|
|
|
|
for pattern, s in benchmarks:
|
|
|
|
|
with self.subTest(pattern=pattern, string=s):
|
|
|
|
|
p = re.compile(pattern)
|
|
|
|
|
self.assertTrue(p.search(s))
|
|
|
|
|
self.assertTrue(p.match(s))
|
|
|
|
|
self.assertTrue(p.fullmatch(s))
|
|
|
|
|
s2 = ' '*10000 + s + ' '*10000
|
|
|
|
|
self.assertTrue(p.search(s2))
|
|
|
|
|
self.assertTrue(p.match(s2, 10000))
|
|
|
|
|
self.assertTrue(p.match(s2, 10000, 10000 + len(s)))
|
|
|
|
|
self.assertTrue(p.fullmatch(s2, 10000, 10000 + len(s)))
|
|
|
|
|
|
|
|
|
|
def test_re_tests(self):
|
|
|
|
|
're_tests test suite'
|
2020-04-29 20:48:37 -03:00
|
|
|
|
from test.re_tests import tests, FAIL, SYNTAX_ERROR
|
2014-12-01 05:06:45 -04:00
|
|
|
|
for t in tests:
|
|
|
|
|
pattern = s = outcome = repl = expected = None
|
|
|
|
|
if len(t) == 5:
|
|
|
|
|
pattern, s, outcome, repl, expected = t
|
|
|
|
|
elif len(t) == 3:
|
|
|
|
|
pattern, s, outcome = t
|
1998-03-26 15:42:58 -04:00
|
|
|
|
else:
|
2014-12-01 05:06:45 -04:00
|
|
|
|
raise ValueError('Test tuples should have 3 or 5 fields', t)
|
|
|
|
|
|
|
|
|
|
with self.subTest(pattern=pattern, string=s):
|
|
|
|
|
if outcome == SYNTAX_ERROR: # Expected a syntax error
|
|
|
|
|
with self.assertRaises(re.error):
|
|
|
|
|
re.compile(pattern)
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
obj = re.compile(pattern)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
result = obj.search(s)
|
2014-12-01 05:06:45 -04:00
|
|
|
|
if outcome == FAIL:
|
|
|
|
|
self.assertIsNone(result, 'Succeeded incorrectly')
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
with self.subTest():
|
|
|
|
|
self.assertTrue(result, 'Failed incorrectly')
|
2003-04-24 16:43:18 -03:00
|
|
|
|
# Matched, as expected, so now we compute the
|
|
|
|
|
# result string and compare it to our expected result.
|
|
|
|
|
start, end = result.span(0)
|
2014-12-01 05:06:45 -04:00
|
|
|
|
vardict = {'found': result.group(0),
|
|
|
|
|
'groups': result.group(),
|
|
|
|
|
'flags': result.re.flags}
|
2003-04-24 16:43:18 -03:00
|
|
|
|
for i in range(1, 100):
|
|
|
|
|
try:
|
|
|
|
|
gi = result.group(i)
|
|
|
|
|
# Special hack because else the string concat fails:
|
|
|
|
|
if gi is None:
|
|
|
|
|
gi = "None"
|
|
|
|
|
except IndexError:
|
|
|
|
|
gi = "Error"
|
|
|
|
|
vardict['g%d' % i] = gi
|
|
|
|
|
for i in result.re.groupindex.keys():
|
|
|
|
|
try:
|
|
|
|
|
gi = result.group(i)
|
|
|
|
|
if gi is None:
|
|
|
|
|
gi = "None"
|
|
|
|
|
except IndexError:
|
|
|
|
|
gi = "Error"
|
|
|
|
|
vardict[i] = gi
|
2014-12-01 05:06:45 -04:00
|
|
|
|
self.assertEqual(eval(repl, vardict), expected,
|
|
|
|
|
'grouping error')
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
2008-07-22 14:53:22 -03:00
|
|
|
|
# Try the match with both pattern and string converted to
|
|
|
|
|
# bytes, and check that it still succeeds.
|
2003-04-24 16:43:18 -03:00
|
|
|
|
try:
|
2008-07-22 14:53:22 -03:00
|
|
|
|
bpat = bytes(pattern, "ascii")
|
|
|
|
|
bs = bytes(s, "ascii")
|
|
|
|
|
except UnicodeEncodeError:
|
|
|
|
|
# skip non-ascii tests
|
|
|
|
|
pass
|
|
|
|
|
else:
|
2014-12-01 05:06:45 -04:00
|
|
|
|
with self.subTest('bytes pattern match'):
|
2014-12-01 05:50:07 -04:00
|
|
|
|
obj = re.compile(bpat)
|
|
|
|
|
self.assertTrue(obj.search(bs))
|
|
|
|
|
|
|
|
|
|
# Try the match with LOCALE enabled, and check that it
|
|
|
|
|
# still succeeds.
|
|
|
|
|
with self.subTest('locale-sensitive match'):
|
|
|
|
|
obj = re.compile(bpat, re.LOCALE)
|
|
|
|
|
result = obj.search(bs)
|
|
|
|
|
if result is None:
|
|
|
|
|
print('=== Fails on locale-sensitive match', t)
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
# Try the match with the search area limited to the extent
|
|
|
|
|
# of the match and see if it still succeeds. \B will
|
|
|
|
|
# break (because it won't match at the end or start of a
|
|
|
|
|
# string), so we'll ignore patterns that feature it.
|
2014-12-01 05:06:45 -04:00
|
|
|
|
if (pattern[:2] != r'\B' and pattern[-2:] != r'\B'
|
|
|
|
|
and result is not None):
|
|
|
|
|
with self.subTest('range-limited match'):
|
|
|
|
|
obj = re.compile(pattern)
|
|
|
|
|
self.assertTrue(obj.search(s, start, end + 1))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
# Try the match with IGNORECASE enabled, and check that it
|
|
|
|
|
# still succeeds.
|
2014-12-01 05:06:45 -04:00
|
|
|
|
with self.subTest('case-insensitive match'):
|
|
|
|
|
obj = re.compile(pattern, re.IGNORECASE)
|
|
|
|
|
self.assertTrue(obj.search(s))
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
# Try the match with UNICODE locale enabled, and check
|
|
|
|
|
# that it still succeeds.
|
2014-12-01 05:06:45 -04:00
|
|
|
|
with self.subTest('unicode-sensitive match'):
|
|
|
|
|
obj = re.compile(pattern, re.UNICODE)
|
|
|
|
|
self.assertTrue(obj.search(s))
|
2010-07-27 02:31:29 -03:00
|
|
|
|
|
2003-04-24 16:43:18 -03:00
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
2014-12-01 05:06:45 -04:00
|
|
|
|
unittest.main()
|