Mailman 3 September 2004 - Python-checkins

python/dist/src/Modules _bsddb.c, 1.17.6.4, 1.17.6.5
by greg＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12657 Modified Files: Tag: release23-maint _bsddb.c Log Message: SF bug 1017405: DB keys() values() and items() methods were ignoring their txn argument. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.17.6.4 retrieving revision 1.17.6.5 diff -u -d -r1.17.6.4 -r1.17.6.5 --- _bsddb.c 16 Mar 2004 07:47:45 -0000 1.17.6.4 +++ _bsddb.c 4 Sep 2004 01:41:01 -0000 1.17.6.5 @@ -2409,7 +2409,7 @@ /* get a cursor */ MYDB_BEGIN_ALLOW_THREADS; - err = self->db->cursor(self->db, NULL, &cursor, 0); + err = self->db->cursor(self->db, txn, &cursor, 0); MYDB_END_ALLOW_THREADS; RETURN_IF_ERR();

1 0

python/dist/src/Modules _bsddb.c,1.37,1.38
by greg＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12100 Modified Files: _bsddb.c Log Message: SF bug 1017405: the keys() values() and items() DB methods were ignoring their transaction (txn) argument. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- _bsddb.c 9 Jul 2004 23:33:06 -0000 1.37 +++ _bsddb.c 4 Sep 2004 01:36:59 -0000 1.38 @@ -2570,7 +2570,7 @@ /* get a cursor */ MYDB_BEGIN_ALLOW_THREADS; - err = self->db->cursor(self->db, NULL, &cursor, 0); + err = self->db->cursor(self->db, txn, &cursor, 0); MYDB_END_ALLOW_THREADS; RETURN_IF_ERR();

1 0

python/dist/src/Lib sre_parse.py,1.62,1.63
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25084/Lib Modified Files: sre_parse.py Log Message: Minor aesthetic change in sre_parse.py, as suggested by Mike Coleman. Index: sre_parse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/sre_parse.py,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- sre_parse.py 3 Sep 2004 17:06:09 -0000 1.62 +++ sre_parse.py 3 Sep 2004 20:15:56 -0000 1.63 @@ -738,8 +738,8 @@ isoctal = False if s.next in DIGITS: this = this + sget() - if (c in OCTDIGITS and s.next in OCTDIGITS and - this[2] in OCTDIGITS): + if (c in OCTDIGITS and this[2] in OCTDIGITS and + s.next in OCTDIGITS): this = this + sget() isoctal = True literal(makechar(int(this[1:], 8) & 0xff))

1 0

python/dist/src/Lib random.py,1.65,1.66
by rhettinger＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13588 Modified Files: random.py Log Message: SF bug #1022010: Import random fails * trap NotImplementedError raised by os.urandom calls when not available on a particular system. Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- random.py 31 Aug 2004 02:19:55 -0000 1.65 +++ random.py 3 Sep 2004 19:09:22 -0000 1.66 @@ -62,7 +62,8 @@ try: from os import urandom as _urandom from binascii import hexlify as _hexlify -except ImportError: + _urandom(1) # verify that urandom is implemented +except (ImportError, NotImplementedError): _urandom = None

1 0

python/dist/src/Lib/test test_re.py,1.51,1.52
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2859/Lib/test Modified Files: test_re.py Log Message: Fixing bug #817234, which made SRE get into an infinite loop on empty final matches with finditer(). New test cases included for this bug and for #581080. Index: test_re.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_re.py,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- test_re.py 3 Sep 2004 17:06:10 -0000 1.51 +++ test_re.py 3 Sep 2004 18:11:59 -0000 1.52 @@ -567,6 +567,22 @@ self.assertEqual(re.compile(pattern).split("a.b.c"), ['a','b','c']) + def test_bug_581080(self): + iter = re.finditer(r"\s", "a b") + self.assertEqual(iter.next().span(), (1,2)) + self.assertRaises(StopIteration, iter.next) + + scanner = re.compile(r"\s").scanner("a b") + self.assertEqual(scanner.search().span(), (1, 2)) + self.assertEqual(scanner.search(), None) + + def test_bug_817234(self): + iter = re.finditer(r".*", "asdf") + self.assertEqual(iter.next().span(), (0, 4)) + self.assertEqual(iter.next().span(), (4, 4)) + self.assertRaises(StopIteration, iter.next) + + def run_re_tests(): from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR if verbose:

1 0

python/dist/src/Modules _sre.c,2.107,2.108
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2859/Modules Modified Files: _sre.c Log Message: Fixing bug #817234, which made SRE get into an infinite loop on empty final matches with finditer(). New test cases included for this bug and for #581080. Index: _sre.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v retrieving revision 2.107 retrieving revision 2.108 diff -u -d -r2.107 -r2.108 --- _sre.c 15 Jul 2004 15:54:04 -0000 2.107 +++ _sre.c 3 Sep 2004 18:11:59 -0000 2.108 @@ -539,7 +539,7 @@ break; case SRE_OP_ANY_ALL: - /* repeated dot wildcare. skip to the end of the target + /* repeated dot wildcard. skip to the end of the target string, and backtrack from there */ TRACE(("|%p|%p|COUNT ANY_ALL\n", pattern, ptr)); ptr = end; @@ -3244,8 +3244,7 @@ match = pattern_new_match((PatternObject*) self->pattern, state, status); - if ((status == 0 || state->ptr == state->start) && - state->ptr < state->end) + if (status == 0 || state->ptr == state->start) state->start = (void*) ((char*) state->ptr + state->charsize); else state->start = state->ptr; @@ -3276,8 +3275,7 @@ match = pattern_new_match((PatternObject*) self->pattern, state, status); - if ((status == 0 || state->ptr == state->start) && - state->ptr < state->end) + if (status == 0 || state->ptr == state->start) state->start = (void*) ((char*) state->ptr + state->charsize); else state->start = state->ptr;

1 0

python/dist/src/Doc/lib libre.tex,1.108,1.109
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22680/Doc/lib Modified Files: libre.tex Log Message: Applying modified version of patch #1018386, which fixes some escaping bugs in SRE. Index: libre.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libre.tex,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- libre.tex 18 Oct 2003 15:28:22 -0000 1.108 +++ libre.tex 3 Sep 2004 17:06:10 -0000 1.109 @@ -387,7 +387,8 @@ Octal escapes are included in a limited form: If the first digit is a 0, or if there are three octal digits, it is considered an octal -escape. Otherwise, it is a group reference. +escape. Otherwise, it is a group reference. As for string literals, +octal escapes are always at most three digits in length. % Note the lack of a period in the section title; it causes problems

1 0

python/dist/src/Lib sre_parse.py,1.61,1.62
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22680/Lib Modified Files: sre_parse.py Log Message: Applying modified version of patch #1018386, which fixes some escaping bugs in SRE. Index: sre_parse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/sre_parse.py,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- sre_parse.py 25 Aug 2004 02:22:29 -0000 1.61 +++ sre_parse.py 3 Sep 2004 17:06:09 -0000 1.62 @@ -217,21 +217,11 @@ # check that group name is a valid string if not isident(name[0]): return False - for char in name: + for char in name[1:]: if not isident(char) and not isdigit(char): return False return True -def _group(escape, groups): - # check if the escape string represents a valid group - try: - gid = int(escape[1:]) - if gid and gid < groups: - return gid - except ValueError: - pass - return None # not a valid group - def _class_escape(source, escape): # handle escape code inside character class code = ESCAPES.get(escape) @@ -241,7 +231,8 @@ if code: return code try: - if escape[1:2] == "x": + c = escape[1:2] + if c == "x": # hexadecimal escape (exactly two digits) while source.next in HEXDIGITS and len(escape) < 4: escape = escape + source.get() @@ -249,12 +240,14 @@ if len(escape) != 2: raise error, "bogus escape: %s" % repr("\\" + escape) return LITERAL, int(escape, 16) & 0xff - elif escape[1:2] in OCTDIGITS: + elif c in OCTDIGITS: # octal escape (up to three digits) - while source.next in OCTDIGITS and len(escape) < 5: + while source.next in OCTDIGITS and len(escape) < 4: escape = escape + source.get() escape = escape[1:] return LITERAL, int(escape, 8) & 0xff + elif c in DIGITS: + raise error, "bogus escape: %s" % repr(escape) if len(escape) == 2: return LITERAL, ord(escape[1]) except ValueError: @@ -270,19 +263,20 @@ if code: return code try: - if escape[1:2] == "x": + c = escape[1:2] + if c == "x": # hexadecimal escape while source.next in HEXDIGITS and len(escape) < 4: escape = escape + source.get() if len(escape) != 4: raise ValueError return LITERAL, int(escape[2:], 16) & 0xff - elif escape[1:2] == "0": + elif c == "0": # octal escape while source.next in OCTDIGITS and len(escape) < 4: escape = escape + source.get() return LITERAL, int(escape[1:], 8) & 0xff - elif escape[1:2] in DIGITS: + elif c in DIGITS: # octal escape *or* decimal group reference (sigh) if source.next in DIGITS: escape = escape + source.get() @@ -291,9 +285,9 @@ # got three octal digits; this is an octal escape escape = escape + source.get() return LITERAL, int(escape[1:], 8) & 0xff - # got at least one decimal digit; this is a group reference - group = _group(escape, state.groups) - if group: + # not an octal escape, so this is a group reference + group = int(escape[1:]) + if group < state.groups: if not state.checkgroup(group): raise error, "cannot refer to open group" return GROUPREF, group @@ -709,7 +703,8 @@ break # end of replacement string if this and this[0] == "\\": # group - if this == "\\g": + c = this[1:2] + if c == "g": name = "" if s.match("<"): while 1: @@ -723,6 +718,8 @@ raise error, "bad group name" try: index = int(name) + if index < 0: + raise error, "negative group number" except ValueError: if not isname(name): raise error, "bad character in group name" @@ -731,26 +728,23 @@ except KeyError: raise IndexError, "unknown group name" a((MARK, index)) - elif len(this) > 1 and this[1] in DIGITS: - code = None - while 1: - group = _group(this, pattern.groups+1) - if group: - if (s.next not in DIGITS or - not _group(this + s.next, pattern.groups+1)): - code = MARK, group - break - elif s.next in OCTDIGITS: + elif c == "0": + if s.next in OCTDIGITS: + this = this + sget() + if s.next in OCTDIGITS: this = this + sget() - else: - break - if not code: - this = this[1:] - code = LITERAL, makechar(int(this[-6:], 8) & 0xff) - if code[0] is LITERAL: - literal(code[1]) - else: - a(code) + literal(makechar(int(this[1:], 8) & 0xff)) + elif c in DIGITS: + isoctal = False + if s.next in DIGITS: + this = this + sget() + if (c in OCTDIGITS and s.next in OCTDIGITS and + this[2] in OCTDIGITS): + this = this + sget() + isoctal = True + literal(makechar(int(this[1:], 8) & 0xff)) + if not isoctal: + a((MARK, int(this[1:]))) else: try: this = makechar(ESCAPES[this][1]) @@ -782,7 +776,7 @@ for index, group in groups: literals[index] = s = g(group) if s is None: - raise IndexError + raise error, "unmatched group" except IndexError: - raise error, "empty group" + raise error, "invalid group reference" return sep.join(literals)

1 0

python/dist/src/Lib/test test_re.py,1.50,1.51
by niemeyer＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22680/Lib/test Modified Files: test_re.py Log Message: Applying modified version of patch #1018386, which fixes some escaping bugs in SRE. Index: test_re.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_re.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- test_re.py 31 May 2004 03:09:25 -0000 1.50 +++ test_re.py 3 Sep 2004 17:06:10 -0000 1.51 @@ -83,6 +83,48 @@ self.assertEqual(re.sub('\r\n', '\n', 'abc\r\ndef\r\n'), 'abc\ndef\n') + 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') + + 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') + + self.assertEqual(re.sub('x', r'\400', 'x'), '\0') + self.assertEqual(re.sub('x', r'\777', 'x'), '\377') + + self.assertRaises(re.error, re.sub, 'x', r'\1', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\8', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\9', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\11', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\18', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\1a', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\90', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\99', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\118', 'x') # r'\11' + '8' + self.assertRaises(re.error, re.sub, 'x', r'\11a', 'x') + self.assertRaises(re.error, re.sub, 'x', r'\181', 'x') # r'\18' + '1' + self.assertRaises(re.error, re.sub, 'x', r'\800', 'x') # r'\80' + '0' + + # 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') + def test_qualified_re_sub(self): self.assertEqual(re.sub('a', 'b', 'aaaaa'), 'bbbbb') self.assertEqual(re.sub('a', 'b', 'aaaaa', 1), 'baaaa') @@ -105,6 +147,7 @@ self.assertRaises(IndexError, re.sub, '(?P<a>x)', '\g<ab>', 'xx') self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\g<b>', 'xx') self.assertRaises(re.error, re.sub, '(?P<a>x)|(?P<b>y)', '\\2', 'xx') + self.assertRaises(re.error, re.sub, '(?P<a>x)', '\g<-1>', 'xx') def test_re_subn(self): self.assertEqual(re.subn("(?i)b+", "x", "bbbb BBBB"), ('x x', 2)) @@ -386,6 +429,16 @@ self.assertNotEqual(re.match(r"\x%02xz" % i, chr(i)+"z"), None) self.assertRaises(re.error, re.match, "\911", "") + def test_sre_character_class_literals(self): + for i in [0, 8, 16, 32, 64, 127, 128, 255]: + self.assertNotEqual(re.match(r"[\%03o]" % i, chr(i)), None) + self.assertNotEqual(re.match(r"[\%03o0]" % i, chr(i)), None) + self.assertNotEqual(re.match(r"[\%03o8]" % i, chr(i)), None) + self.assertNotEqual(re.match(r"[\x%02x]" % i, chr(i)), None) + self.assertNotEqual(re.match(r"[\x%02x0]" % i, chr(i)), None) + self.assertNotEqual(re.match(r"[\x%02xz]" % i, chr(i)), None) + self.assertRaises(re.error, re.match, "[\911]", "") + 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)

1 0

python/dist/src/PC empty.c,NONE,1.1
by loewis＠users.sourceforge.net Sept. 3, 2004

Sept. 3, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18880 Added Files: empty.c Log Message: Add main program for icon file. --- NEW FILE: empty.c --- #include <windows.h> int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { return 0; }

1 0