Mailman 3 January 2006 - Python-checkins

r42212 - in python/trunk: Lib/difflib.py Lib/test/test_difflib.py Misc/NEWS
by gustavo.niemeyer 31 Jan '06

31 Jan '06

Author: gustavo.niemeyer Date: Tue Jan 31 19:34:13 2006 New Revision: 42212 Modified: python/trunk/Lib/difflib.py python/trunk/Lib/test/test_difflib.py python/trunk/Misc/NEWS Log: Patch #1413711: Certain patterns of differences were making difflib touch the recursion limit. The applied patch inlines the recursive __helper method in a non-recursive way. Modified: python/trunk/Lib/difflib.py ============================================================================== --- python/trunk/Lib/difflib.py (original) +++ python/trunk/Lib/difflib.py Tue Jan 31 19:34:13 2006 @@ -473,26 +473,31 @@ if self.matching_blocks is not None: return self.matching_blocks - self.matching_blocks = [] la, lb = len(self.a), len(self.b) - self.__helper(0, la, 0, lb, self.matching_blocks) - self.matching_blocks.append( (la, lb, 0) ) - return self.matching_blocks - # builds list of matching blocks covering a[alo:ahi] and - # b[blo:bhi], appending them in increasing order to answer + indexed_blocks = [] + queue = [(0, la, 0, lb)] + while queue: + # builds list of matching blocks covering a[alo:ahi] and + # b[blo:bhi], appending them in increasing order to answer + alo, ahi, blo, bhi = queue.pop() + + # a[alo:i] vs b[blo:j] unknown + # a[i:i+k] same as b[j:j+k] + # a[i+k:ahi] vs b[j+k:bhi] unknown + i, j, k = x = self.find_longest_match(alo, ahi, blo, bhi) + + if k: + if alo < i and blo < j: + queue.append((alo, i, blo, j)) + indexed_blocks.append((i, x)) + if i+k < ahi and j+k < bhi: + queue.append((i+k, ahi, j+k, bhi)) + indexed_blocks.sort() - def __helper(self, alo, ahi, blo, bhi, answer): - i, j, k = x = self.find_longest_match(alo, ahi, blo, bhi) - # a[alo:i] vs b[blo:j] unknown - # a[i:i+k] same as b[j:j+k] - # a[i+k:ahi] vs b[j+k:bhi] unknown - if k: - if alo < i and blo < j: - self.__helper(alo, i, blo, j, answer) - answer.append(x) - if i+k < ahi and j+k < bhi: - self.__helper(i+k, ahi, j+k, bhi, answer) + self.matching_blocks = [elem[1] for elem in indexed_blocks] + self.matching_blocks.append( (la, lb, 0) ) + return self.matching_blocks def get_opcodes(self): """Return list of 5-tuples describing how to turn a into b. Modified: python/trunk/Lib/test/test_difflib.py ============================================================================== --- python/trunk/Lib/test/test_difflib.py (original) +++ python/trunk/Lib/test/test_difflib.py Tue Jan 31 19:34:13 2006 @@ -2,6 +2,7 @@ from test.test_support import run_unittest, findfile import unittest import doctest +import sys class TestSFbugs(unittest.TestCase): @@ -143,6 +144,14 @@ self.assertEqual(actual,expect) + def test_recursion_limit(self): + # Check if the problem described in patch #1413711 exists. + limit = sys.getrecursionlimit() + old = [(i%2 and "K:%d" or "V:A:%d") % i for i in range(limit*2)] + new = [(i%2 and "K:%d" or "V:B:%d") % i for i in range(limit*2)] + difflib.SequenceMatcher(None, old, new).get_opcodes() + + Doctests = doctest.DocTestSuite(difflib) run_unittest(TestSFpatches, TestSFbugs, Doctests) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Tue Jan 31 19:34:13 2006 @@ -676,6 +676,9 @@ - ` uu.encode()`` and ``uu.decode()`` now support unicode filenames. +- Patch #1413711: Certain patterns of differences were making difflib + touch the recursion limit. + Build -----

1 0

r42211 - sandbox/trunk/pycon/Makefile sandbox/trunk/pycon/README
by david.goodger 31 Jan '06

31 Jan '06

Author: david.goodger Date: Tue Jan 31 16:27:24 2006 New Revision: 42211 Modified: sandbox/trunk/pycon/Makefile sandbox/trunk/pycon/README Log: updated for renamed parse_sched.py Modified: sandbox/trunk/pycon/Makefile ============================================================================== --- sandbox/trunk/pycon/Makefile (original) +++ sandbox/trunk/pycon/Makefile Tue Jan 31 16:27:24 2006 @@ -1,4 +1,4 @@ html: - ./parse-sched.py --format=html <FinalSchedule >schedule.html + ./parse_sched.py --format=html <FinalSchedule >schedule.html Modified: sandbox/trunk/pycon/README ============================================================================== --- sandbox/trunk/pycon/README (original) +++ sandbox/trunk/pycon/README Tue Jan 31 16:27:24 2006 @@ -6,13 +6,13 @@ get.sh Fetches the source of the PyCon2006/FinalSchedule wiki page and saves it as FinalSchedule. (Uses GNU wget) -parse-sched.py Reads the source of the FinalSchedule page from stdin, +parse_sched.py Reads the source of the FinalSchedule page from stdin, and can output the schedule as HTML or a Python data structure. Run get.sh once; then invoke the script with something like: - ./parse-sched.py --format=html <FinalSchedule >schedule.html + ./parse_sched.py --format=html <FinalSchedule >schedule.html Please feel free to submit patches that add new output formats. If you have commit privileges, feel free to just check in changes that add

1 0

r42210 - sandbox/trunk/pycon/parse-sched.py sandbox/trunk/pycon/parse_sched.py
by david.goodger 31 Jan '06

31 Jan '06

Author: david.goodger Date: Tue Jan 31 16:26:21 2006 New Revision: 42210 Added: sandbox/trunk/pycon/parse_sched.py - copied unchanged from r42208, sandbox/trunk/pycon/parse-sched.py Removed: sandbox/trunk/pycon/parse-sched.py Log: renamed to parse_sched to make importable Deleted: /sandbox/trunk/pycon/parse-sched.py ============================================================================== --- /sandbox/trunk/pycon/parse-sched.py Tue Jan 31 16:26:21 2006 +++ (empty file) @@ -1,229 +0,0 @@ -#!/usr/bin/env python - -# Reads a page with a wiki-format table - -# Basic data structure of dictionary: -# {(year, month, day) -> [(room, time, duration, title)] - -import sys, optparse -import re, string -import pprint, cgi -import datetime - -import talks - -date_pat = re.compile('^=\s+(\d{4})-(\d{2})-(\d{1,2})\s+.*\s+=') -line_pat = re.compile('[|]{2}.*[|]{2}\s*$') -talk_pat = re.compile('#(\d+)') - -def parse (lines): - lines = map(string.strip, lines) - d = {} - date = None - - for line in lines: - m = date_pat.match(line) - if m: - date = [int(value) for value in m.group(1,2,3)] - date = tuple(date) - - m = line_pat.match(line) - if m: - if date is None: - print >>sys.stderr, "Table line before date header: %r" % line - else: - L = line.split('||') - L = map(string.strip, L) - assert L[0] == '' - assert L[-1] == '' - L = L[1:-1] - if len(L) != 4: - print >>sys.stderr, "Wrong number of fields in line: %r" % line - # Skip headers - elif L[0].lower() == 'room': - pass - else: - event_list = d.setdefault(date, []) - t = canonicalize_presentation(L) - event_list.append(t) - - return d - - -time_pat = re.compile('(\d+):(\d+)') - -def parse_time (S): - """(str): (int, int) - Parse a time into an (hour, minute) tuple. - """ - m = time_pat.match(S) - assert m is not None - hour, min = int(m.group(1)), int(m.group(2)) - return hour, min - - -def canonicalize_presentation (L): - """Take a 4-item list for a talk and perform various - corrections to it. - """ - hour, min = parse_time(L[1]) - L[1] = '%02i:%02i' % (hour, min) - L[2] = int(L[2]) - return tuple(L) - - - -# -# HTML generation functions -# - -def add_time (start_time, duration): - hour, min = parse_time(start_time) - while duration > 60: - hour += 1 - duration -= 60 - min += duration - while min >= 60: - hour += 1 - min -= 60 - return '%02i:%02i' % (hour, min) - -def find_next_time (time_list, end_time): - if len(time_list) == 0: - return 1 - span = 0 - while (span < len(time_list) and time_list[span][0] < end_time): - span += 1 - if span == len(time_list): - return 1 - return span+1 - - -def format_day (day, output): - # Figure out unique rooms - rooms = [] - for room, time, duration, title in day: - # XXX change to use regex pattern - if room.startswith('-'): - continue - if room not in rooms: - rooms.append(room) - rooms.sort() - - # Move Bent Tree to be last - if 'Bent Tree' in rooms: - rooms.remove('Bent Tree') - rooms.append('Bent Tree') - - # Print room header - print >>output, '''<table width="80%%" border=3> -<col width="75"><col span=%i width="*"> -''' % len(rooms) - - print >>output, "<thead>" - print >>output, '<tr><td></td>', - for room in rooms: - print >>output, '<th>%s</th>' % room, - print >>output, '</tr>' - print >>output, "</thead>" - - # Sort list - time_dict = {} - for room, time, duration, title in day: - d = time_dict.setdefault(time, {}) - d[room] = (duration, title) - time_list = time_dict.items() - time_list.sort() - - active = {} - print '<tbody>' - while len(time_list) > 0: - time, room_dict = time_list.pop(0) - print >>output, '<tr>', - for act_room, end_time in active.items(): - if end_time <= time: - del active[act_room] - print >>output, '<th>%s</th>' % time, - plenary = (len(room_dict) == 1 and room_dict.keys()[0] == '---') - if plenary: - # Plenary session of some sort - duration, title = room_dict.values()[0] - colspan = len(rooms) - print >>output, '<td align="center" colspan=%i>%s</td>' % (colspan, title), - print >>output, '</tr>' - continue - - for room in rooms: - # Room still occupied, so skip it - if room in active: - continue - - # New room - t = room_dict.get(room) - if t is None: - print >>output, '<td rowspan=1> </td>', - else: - duration, title = t - end_time = add_time(time, duration) - active[room] = end_time - rowspan = find_next_time(time_list, end_time) - - # Turn talk numbers into a link with a title - m = talk_pat.match(title) - if m is not None: - talk_num = int(m.group(1)) - title = talks.get_title(talk_num) - url = ('http://wiki.python.org/moin/PyCon2006/Talks#%s' - % talk_num) - title = '%s (<a href="%s">%s</a>)' % (cgi.escape(title), - url, talk_num) - else: - title = cgi.escape(title) - - print >>output, '<td rowspan="%i">' % rowspan, - print >>output, title, - print >>output, '</td>', - - print >>output, '</tr>' - - print '</tbody>' - print >>output, '</table>' - - -def output_html (d, output): - L = d.items() ; L.sort() - - for (y, m, day), day_data in L: - date = datetime.date(y, m, day) - print >>output, date.strftime('<h3>%A, %B %d %Y</h3>') - format_day(day_data, output) - - -def main (): - parser = optparse.OptionParser(usage="usage: %prog [options] < final-schedule") - parser.add_option('--format', - type='choice', - choices=['pickle', 'python', 'print', 'html'], - default='print', - action="store", dest="format", - help = "Select output format") - options, args = parser.parse_args() - - d = parse(lines=sys.stdin.readlines()) - fmt = options.format - if fmt == 'print': - pprint.pprint(d) - elif fmt == 'python': - print 'schedule =', - pprint.pprint(d) - elif fmt == 'pickle': - import cPickle - cPickle.dump(d, sys.stdout) - elif fmt == 'html': - output_html(d, sys.stdout) - else: - print >>sys.stderr, "Unknown format %r" % fmt - sys.exit(1) - -if __name__ == '__main__': - main()

1 0

r42209 - sandbox/trunk/pycon/talks.py
by david.goodger 31 Jan '06

31 Jan '06

Author: david.goodger Date: Tue Jan 31 16:25:40 2006 New Revision: 42209 Modified: sandbox/trunk/pycon/talks.py Log: get_title just returns the title -- HTML processing elsewhere Modified: sandbox/trunk/pycon/talks.py ============================================================================== --- sandbox/trunk/pycon/talks.py (original) +++ sandbox/trunk/pycon/talks.py Tue Jan 31 16:25:40 2006 @@ -57,14 +57,8 @@ 73: 'State of Zope', } -import cgi - def get_title (num): title = talk_dict.get(num) if title is None: return '#' + str(num) - - url = 'http://wiki.python.org/moin/PyCon2006/Talks#' + str(num) - title = cgi.escape(title) - return '<a href="%s">%s</a>' % (url, title) - + return title

1 0

r42208 - sandbox/trunk/pycon/parse-sched.py
by david.goodger 31 Jan '06

31 Jan '06

Author: david.goodger Date: Tue Jan 31 16:25:23 2006 New Revision: 42208 Modified: sandbox/trunk/pycon/parse-sched.py Log: parameterized parse(); partially fixed plenary logic; added talk number to rendered title; whitespace Modified: sandbox/trunk/pycon/parse-sched.py ============================================================================== --- sandbox/trunk/pycon/parse-sched.py (original) +++ sandbox/trunk/pycon/parse-sched.py Tue Jan 31 16:25:23 2006 @@ -3,7 +3,7 @@ # Reads a page with a wiki-format table # Basic data structure of dictionary: -# {(year, month, day) -> [(time, duration, title)] +# {(year, month, day) -> [(room, time, duration, title)] import sys, optparse import re, string @@ -16,18 +16,17 @@ line_pat = re.compile('[|]{2}.*[|]{2}\s*$') talk_pat = re.compile('#(\d+)') -def parse (): - lines = sys.stdin.readlines() +def parse (lines): lines = map(string.strip, lines) d = {} date = None - + for line in lines: m = date_pat.match(line) if m: date = [int(value) for value in m.group(1,2,3)] date = tuple(date) - + m = line_pat.match(line) if m: if date is None: @@ -71,7 +70,7 @@ L[1] = '%02i:%02i' % (hour, min) L[2] = int(L[2]) return tuple(L) - + # @@ -98,8 +97,8 @@ if span == len(time_list): return 1 return span+1 - - + + def format_day (day, output): # Figure out unique rooms rooms = [] @@ -127,7 +126,7 @@ print >>output, '<th>%s</th>' % room, print >>output, '</tr>' print >>output, "</thead>" - + # Sort list time_dict = {} for room, time, duration, title in day: @@ -145,7 +144,7 @@ if end_time <= time: del active[act_room] print >>output, '<th>%s</th>' % time, - plenary = (len(room_dict) == 1) + plenary = (len(room_dict) == 1 and room_dict.keys()[0] == '---') if plenary: # Plenary session of some sort duration, title = room_dict.values()[0] @@ -153,7 +152,7 @@ print >>output, '<td align="center" colspan=%i>%s</td>' % (colspan, title), print >>output, '</tr>' continue - + for room in rooms: # Room still occupied, so skip it if room in active: @@ -174,13 +173,17 @@ if m is not None: talk_num = int(m.group(1)) title = talks.get_title(talk_num) + url = ('http://wiki.python.org/moin/PyCon2006/Talks#%s' + % talk_num) + title = '%s (<a href="%s">%s</a>)' % (cgi.escape(title), + url, talk_num) else: title = cgi.escape(title) - + print >>output, '<td rowspan="%i">' % rowspan, print >>output, title, print >>output, '</td>', - + print >>output, '</tr>' print '</tbody>' @@ -195,7 +198,7 @@ print >>output, date.strftime('<h3>%A, %B %d %Y</h3>') format_day(day_data, output) - + def main (): parser = optparse.OptionParser(usage="usage: %prog [options] < final-schedule") parser.add_option('--format', @@ -206,7 +209,7 @@ help = "Select output format") options, args = parser.parse_args() - d = parse() + d = parse(lines=sys.stdin.readlines()) fmt = options.format if fmt == 'print': pprint.pprint(d) @@ -221,12 +224,6 @@ else: print >>sys.stderr, "Unknown format %r" % fmt sys.exit(1) - + if __name__ == '__main__': main() - - - - - -

1 0

r42207 - sandbox/trunk/pycon/Makefile
by andrew.kuchling 31 Jan '06

31 Jan '06

Author: andrew.kuchling Date: Tue Jan 31 15:28:30 2006 New Revision: 42207 Added: sandbox/trunk/pycon/Makefile Log: Add makefile Added: sandbox/trunk/pycon/Makefile ============================================================================== --- (empty file) +++ sandbox/trunk/pycon/Makefile Tue Jan 31 15:28:30 2006 @@ -0,0 +1,4 @@ + +html: + ./parse-sched.py --format=html <FinalSchedule >schedule.html +

1 0

r42206 - python/trunk/Misc/NEWS
by martin.v.loewis 30 Jan '06

30 Jan '06

Author: martin.v.loewis Date: Mon Jan 30 16:04:31 2006 New Revision: 42206 Modified: python/trunk/Misc/NEWS Log: Fix typo. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Jan 30 16:04:31 2006 @@ -347,7 +347,7 @@ Library ------- -- Patch #1349118: urllib2 now supports user:pass@ style proxy +- Patch #1349118: urllib now supports user:pass@ style proxy specifications, raises IOErrors when proxies for unsupported protocols are defined, and uses the https proxy on https redirections.

1 0

r42205 - python/trunk/Modules/_bsddb.c
by gregory.p.smith 29 Jan '06

29 Jan '06

Author: gregory.p.smith Date: Mon Jan 30 01:22:08 2006 New Revision: 42205 Modified: python/trunk/Modules/_bsddb.c Log: maintain support for older python versions in this module so that it is ok for a standalone pybsddb source dist for use with <= 2.3. Modified: python/trunk/Modules/_bsddb.c ============================================================================== --- python/trunk/Modules/_bsddb.c (original) +++ python/trunk/Modules/_bsddb.c Mon Jan 30 01:22:08 2006 @@ -1537,11 +1537,19 @@ keyObj = PyInt_FromLong(*(int *)key.data); else keyObj = PyString_FromStringAndSize(key.data, key.size); +#if (PY_VERSION_HEX >= 0x02040000) retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj); +#else + retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); +#endif } else /* return just the pkey and data */ { +#if (PY_VERSION_HEX >= 0x02040000) retval = PyTuple_Pack(2, pkeyObj, dataObj); +#else + retval = Py_BuildValue("OO", pkeyObj, dataObj); +#endif } FREE_DBT(pkey); FREE_DBT(data); @@ -3187,12 +3195,20 @@ keyObj = PyInt_FromLong(*(int *)key.data); else keyObj = PyString_FromStringAndSize(key.data, key.size); +#if (PY_VERSION_HEX >= 0x02040000) retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj); +#else + retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); +#endif FREE_DBT(key); } else /* return just the pkey and data */ { +#if (PY_VERSION_HEX >= 0x02040000) retval = PyTuple_Pack(2, pkeyObj, dataObj); +#else + retval = Py_BuildValue("OO", pkeyObj, dataObj); +#endif } FREE_DBT(pkey); FREE_DBT(data);

1 0

r42204 - python/trunk/Lib/bsddb/test/test_1413192.py
by gregory.p.smith 29 Jan '06

29 Jan '06

Author: gregory.p.smith Date: Mon Jan 30 00:54:38 2006 New Revision: 42204 Modified: python/trunk/Lib/bsddb/test/test_1413192.py Log: fix test import for use in standalone pybsddb project bsddb3 module as well as python builtin bsddb. Modified: python/trunk/Lib/bsddb/test/test_1413192.py ============================================================================== --- python/trunk/Lib/bsddb/test/test_1413192.py (original) +++ python/trunk/Lib/bsddb/test/test_1413192.py Mon Jan 30 00:54:38 2006 @@ -4,7 +4,12 @@ # This test relies on the variable names, see the bug report for details. # The problem was that the env was deallocated prior to the txn. -from bsddb import db +try: + # For Pythons w/distutils and add-on pybsddb + from bsddb3 import db +except ImportError: + # For Python >= 2.3 builtin bsddb distribution + from bsddb import db env_name = '.'

1 0

r42203 - python/trunk/Lib/test/test_logging.py
by tim.peters 29 Jan '06

29 Jan '06

Author: tim.peters Date: Sun Jan 29 23:50:26 2006 New Revision: 42203 Modified: python/trunk/Lib/test/test_logging.py Log: Whitespace normalization. Modified: python/trunk/Lib/test/test_logging.py ============================================================================== --- python/trunk/Lib/test/test_logging.py (original) +++ python/trunk/Lib/test/test_logging.py Sun Jan 29 23:50:26 2006 @@ -576,7 +576,7 @@ break else: raise ImportError, "Could not find unused port" - + #Set up a handler such that all events are sent via a socket to the log #receiver (logrecv).

1 0