Mailman 3 December 2003 - Python-checkins

python/dist/src/Lib posixpath.py,1.63,1.64
by rhettinger＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv13466 Modified Files: posixpath.py Log Message: SF Patch 681780: Faster commonprefix (OS independent) Improved based on discussions at: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/252177 http://groups.google.com/groups?th=fc7b54f11af6b24e&seekm=bss2so$om$00$1@ne… Index: posixpath.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/posixpath.py,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** posixpath.py 2 Nov 2003 09:47:05 -0000 1.63 --- posixpath.py 31 Dec 2003 22:44:29 -0000 1.64 *************** *** 124,137 **** "Given a list of pathnames, returns the longest common leading component" if not m: return '' ! prefix = m[0] ! for item in m: ! for i in range(len(prefix)): ! if prefix[:i+1] != item[:i+1]: ! prefix = prefix[:i] ! if i == 0: ! return '' ! break ! return prefix ! # Get size, mtime, atime of files. --- 124,134 ---- "Given a list of pathnames, returns the longest common leading component" if not m: return '' ! s1 = min(m) ! s2 = max(m) ! n = min(len(s1), len(s2)) ! for i in xrange(n): ! if s1[i] != s2[i]: ! return s1[:i] ! return s1[:n] # Get size, mtime, atime of files.

1 0

[Python-checkins] python/nondist/sandbox/parrotbench README.txt, 1.4, 1.5 b0.py, 1.7, 1.8 b4.py, 1.2, 1.3 out0, 1.5, 1.6 out4, 1.3, 1.4
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv6302 Modified Files: README.txt b0.py b4.py out0 out4 Log Message: Attempt to fix the Mac OSX issue Dan found. Index: README.txt =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/README.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README.txt 31 Dec 2003 17:45:32 -0000 1.4 --- README.txt 31 Dec 2003 21:53:11 -0000 1.5 *************** *** 1,4 **** ! Parrot benchmark ! ================ This is a benchmark to be run in front of a live audience at OSCON --- 1,7 ---- ! Parrot benchmark 1.0.1 ! ====================== ! ! [This is version 1.0.1, with a hopeful bugfix for the Mac OSX issue ! Dan reported.] This is a benchmark to be run in front of a live audience at OSCON Index: b0.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b0.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** b0.py 31 Dec 2003 09:04:58 -0000 1.7 --- b0.py 31 Dec 2003 21:53:11 -0000 1.8 *************** *** 729,734 **** output = OutputFile() ! def write(s): ! s = str(s).replace('<b0.', '<__main__.') i = s.find(' at 0x') while i > 0: --- 729,734 ---- output = OutputFile() ! def cleanup(s): ! s = str(s).replace('<__main__.', '<').replace('<b0.', '<') i = s.find(' at 0x') while i > 0: *************** *** 744,747 **** --- 744,751 ---- s = s[:i+5] + s[j:] i = s.find(' at 0x') + return s + + def write(s): + s = cleanup(s) if __debug__: print s, *************** *** 803,807 **** argreprs = map(repr, args) for i, s in enumerate(argreprs): ! s = s.replace('<b0.', '<__main__.') if len(s) >= 45: s = s[:20] + "..." + s[-20:] --- 807,811 ---- argreprs = map(repr, args) for i, s in enumerate(argreprs): ! s = cleanup(s) if len(s) >= 45: s = s[:20] + "..." + s[-20:] *************** *** 884,888 **** parser = Parser(scanner) root = parser.parse() ! checkoutput(2037684980) env = {} eval(root, env, env) --- 888,892 ---- parser = Parser(scanner) root = parser.parse() ! checkoutput(3257889492) env = {} eval(root, env, env) *************** *** 891,895 **** for i in range(10): digits.append(g.next()) ! checkoutput(4201300315) print "".join(map(str, digits)) --- 895,899 ---- for i in range(10): digits.append(g.next()) ! checkoutput(1177172576) print "".join(map(str, digits)) Index: b4.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b4.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** b4.py 31 Dec 2003 09:04:58 -0000 1.2 --- b4.py 31 Dec 2003 21:53:11 -0000 1.3 *************** *** 82,86 **** print sort unInstrumentTree(Node) ! checkoutput(3255652498) if __name__ == '__main__': --- 82,86 ---- print sort unInstrumentTree(Node) ! checkoutput(2403574442) if __name__ == '__main__': Index: out0 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out0,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** out0 31 Dec 2003 06:59:41 -0000 1.5 --- out0 31 Dec 2003 21:53:11 -0000 1.6 *************** *** 2705,2709 **** return [Define(u'pi', [], ...), Define(u'strhash', [u's'], ...)] 3 1 4 1 5 9 2 6 5 3 5 8 9 7 9 3 2 3 8 4 6 2 6 4 3 3 8 3 2 7 9 5 0 2 8 8 4 1 9 7 1 6 9 3 9 9 3 7 5 1 0 5 8 2 0 9 7 4 9 4 4 5 9 2 3 0 7 8 1 6 4 0 6 2 8 6 2 0 8 9 9 8 6 2 8 0 3 4 8 2 5 3 4 2 1 1 7 0 6 7 9 8 2 1 4 8 0 8 6 5 1 3 2 8 2 3 0 6 6 4 7 0 9 3 8 4 4 6 0 9 5 5 0 5 8 2 2 3 1 7 2 5 3 5 9 4 0 8 1 2 8 4 8 1 1 1 7 4 5 0 2 8 4 1 0 2 7 0 1 9 3 8 5 2 1 1 0 5 5 5 9 6 4 4 6 2 2 9 4 8 9 5 4 9 3 0 3 8 1 9 6 4 4 2 8 8 1 0 9 7 5 6 6 5 9 3 3 4 4 6 1 2 8 4 7 5 6 4 8 2 3 3 7 8 6 7 8 3 1 6 5 2 7 1 2 0 1 9 0 9 1 4 5 6 4 8 5 6 6 9 2 3 4 6 0 3 4 8 6 1 0 4 5 4 3 2 6 6 4 8 2 1 3 3 9 3 6 0 7 2 6 0 2 4 9 1 4 1 2 7 3 7 2 4 5 8 7 0 0 6 6 0 6 3 1 5 5 8 8 1 7 4 8 8 1 5 2 0 9 2 0 9 6 2 8 2 9 2 5 4 0 9 1 7 1 5 3 6 4 3 6 7 8 9 2 5 9 0 3 6 0 0 1 1 3 3 0 5 3 0 5 4 8 8 2 0 4 6 6 5 2 1 3 8 4 1 4 6 9 5 1 9 4 1 5 1 1 6 0 9 4 3 3 0 5 7 2 7 0 3 6 5 7 5 9 5 9 1 9 5 3 0 9 2 1 8 6 1 1 7 3 8 1 9 3 2 6 1 1 7 9 3 1 0 5 1 1 8 5 4 8 0 7 4 4 6 2 3 7 9 9 6 2 7 4 9 5 6 7 3 5 1 8 8 5 7 5 2 7 2 4 8 9 1 2 2 7 9 3 8 1 8 3 0 1 1 9 4 9 1 2 9 8 3 3 6 7 3 3 6 2 4 4 0 6 5 6 6 4 3 0 8 6 0 2 1 3 9 4 9 4 6 3 9 5 2 2 4 7 3 7 1 9 0 7 0 2 1 7 9 8 6 0 9 4 3 7 0 2 7 7 0 5 3 9 2 1 7 1 7 6 2 9 3 1 7 6 7 5 2 3 8 4 6 7 4 8 1 8 4 6 7 6 6 9 4 0 5 1 3 2 0 0 0 5 6 8 1 2 7 1 4 5 2 6 3 5 6 0 8 2 7 7 8 5 7 7 1 3 4 2 7 5 7 7 8 9 6 0 9 1 7 3 6 3 7 1 7 8 7 2 1 4 6 8 4 4 0 9 0 1 2 2 4 9 5 3 4 3 0 1 4 6 5 4 9 5 8 5 3 7 1 0 5 0 7 9 2 2 7 9 6 8 9 2 5 8 9 2 3 5 4 2 0 1 9 9 5 6 1 1 2 1 2 9 0 2 1 9 6 0 8 6 4 0 3 4 4 1 8 1 5 9 8 1 3 6 2 9 7 7 4 7 7 1 3 0 9 9 6 0 5 1 8 7 0 7 2 1 1 3 4 9 9 9 9 9 9 8 3 7 2 9 7 8 0 4 9 9 5 1 0 5 9 7 3 1 7 3 2 8 1 6 0 9 6 3 1 8 5 9 5 0 2 4 4 5 9 4 5 5 3 4 6 9 0 8 3 0 2 6 4 2 5 2 2 3 0 8 2 5 3 3 4 4 6 8 5 0 3 5 2 6 1 9 3 1 1 8 8 1 7 1 0 1 0 0 0 3 1 3 7 8 3 8 7 5 2 8 8 6 5 8 7 5 3 3 2 0 8 3 8 1 4 2 0 6 1 7 1 7 7 6 6 9 1 4 7 3 0 3 5 9 8 2 5 3 4 9 0 4 2 8 7 5 5 4 6 8 7 3 1 1 5 9 5 6 2 8 6 3 8 8 2 3 5 3 7 8 7 5 9 3 7 5 1 9 5 7 7 8 1 8 5 7 7 8 0 5 3 2 1 7 1 2 2 6 8 0 6 6 1 3 0 0 1 9 2 7 8 7 6 6 1 1 1 9 5 9 0 9 2 1 6 4 2 0 1 9 8 ! Parser.__init__('<__main__.Clone object at 0>') Parser.nexttoken('') return (NAME, u'def') --- 2705,2709 ---- return [Define(u'pi', [], ...), Define(u'strhash', [u's'], ...)] 3 1 4 1 5 9 2 6 5 3 5 8 9 7 9 3 2 3 8 4 6 2 6 4 3 3 8 3 2 7 9 5 0 2 8 8 4 1 9 7 1 6 9 3 9 9 3 7 5 1 0 5 8 2 0 9 7 4 9 4 4 5 9 2 3 0 7 8 1 6 4 0 6 2 8 6 2 0 8 9 9 8 6 2 8 0 3 4 8 2 5 3 4 2 1 1 7 0 6 7 9 8 2 1 4 8 0 8 6 5 1 3 2 8 2 3 0 6 6 4 7 0 9 3 8 4 4 6 0 9 5 5 0 5 8 2 2 3 1 7 2 5 3 5 9 4 0 8 1 2 8 4 8 1 1 1 7 4 5 0 2 8 4 1 0 2 7 0 1 9 3 8 5 2 1 1 0 5 5 5 9 6 4 4 6 2 2 9 4 8 9 5 4 9 3 0 3 8 1 9 6 4 4 2 8 8 1 0 9 7 5 6 6 5 9 3 3 4 4 6 1 2 8 4 7 5 6 4 8 2 3 3 7 8 6 7 8 3 1 6 5 2 7 1 2 0 1 9 0 9 1 4 5 6 4 8 5 6 6 9 2 3 4 6 0 3 4 8 6 1 0 4 5 4 3 2 6 6 4 8 2 1 3 3 9 3 6 0 7 2 6 0 2 4 9 1 4 1 2 7 3 7 2 4 5 8 7 0 0 6 6 0 6 3 1 5 5 8 8 1 7 4 8 8 1 5 2 0 9 2 0 9 6 2 8 2 9 2 5 4 0 9 1 7 1 5 3 6 4 3 6 7 8 9 2 5 9 0 3 6 0 0 1 1 3 3 0 5 3 0 5 4 8 8 2 0 4 6 6 5 2 1 3 8 4 1 4 6 9 5 1 9 4 1 5 1 1 6 0 9 4 3 3 0 5 7 2 7 0 3 6 5 7 5 9 5 9 1 9 5 3 0 9 2 1 8 6 1 1 7 3 8 1 9 3 2 6 1 1 7 9 3 1 0 5 1 1 8 5 4 8 0 7 4 4 6 2 3 7 9 9 6 2 7 4 9 5 6 7 3 5 1 8 8 5 7 5 2 7 2 4 8 9 1 2 2 7 9 3 8 1 8 3 0 1 1 9 4 9 1 2 9 8 3 3 6 7 3 3 6 2 4 4 0 6 5 6 6 4 3 0 8 6 0 2 1 3 9 4 9 4 6 3 9 5 2 2 4 7 3 7 1 9 0 7 0 2 1 7 9 8 6 0 9 4 3 7 0 2 7 7 0 5 3 9 2 1 7 1 7 6 2 9 3 1 7 6 7 5 2 3 8 4 6 7 4 8 1 8 4 6 7 6 6 9 4 0 5 1 3 2 0 0 0 5 6 8 1 2 7 1 4 5 2 6 3 5 6 0 8 2 7 7 8 5 7 7 1 3 4 2 7 5 7 7 8 9 6 0 9 1 7 3 6 3 7 1 7 8 7 2 1 4 6 8 4 4 0 9 0 1 2 2 4 9 5 3 4 3 0 1 4 6 5 4 9 5 8 5 3 7 1 0 5 0 7 9 2 2 7 9 6 8 9 2 5 8 9 2 3 5 4 2 0 1 9 9 5 6 1 1 2 1 2 9 0 2 1 9 6 0 8 6 4 0 3 4 4 1 8 1 5 9 8 1 3 6 2 9 7 7 4 7 7 1 3 0 9 9 6 0 5 1 8 7 0 7 2 1 1 3 4 9 9 9 9 9 9 8 3 7 2 9 7 8 0 4 9 9 5 1 0 5 9 7 3 1 7 3 2 8 1 6 0 9 6 3 1 8 5 9 5 0 2 4 4 5 9 4 5 5 3 4 6 9 0 8 3 0 2 6 4 2 5 2 2 3 0 8 2 5 3 3 4 4 6 8 5 0 3 5 2 6 1 9 3 1 1 8 8 1 7 1 0 1 0 0 0 3 1 3 7 8 3 8 7 5 2 8 8 6 5 8 7 5 3 3 2 0 8 3 8 1 4 2 0 6 1 7 1 7 7 6 6 9 1 4 7 3 0 3 5 9 8 2 5 3 4 9 0 4 2 8 7 5 5 4 6 8 7 3 1 1 5 9 5 6 2 8 6 3 8 8 2 3 5 3 7 8 7 5 9 3 7 5 1 9 5 7 7 8 1 8 5 7 7 8 0 5 3 2 1 7 1 2 2 6 8 0 6 6 1 3 0 0 1 9 2 7 8 7 6 6 1 1 1 9 5 9 0 9 2 1 6 4 2 0 1 9 8 ! Parser.__init__('<Clone object at 0>') Parser.nexttoken('') [...4327 lines suppressed...] ! Exprs.assign("(3L, 3L), {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") ! Name.assign("3L, {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return ! Name.assign("3L, {u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return return return ! While.geneval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return <generator object at 0> ! Binop.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") ! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return 3L ! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return 3L return True ! Yield.geneval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return <generator object at 0> ! Name.eval("{u'strhash': <Functi...erator object at 0>}, {u'a': 9576126383040...1552000L, u'd1': 3L}") return 3L 3141592653 Index: out4 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** out4 31 Dec 2003 02:05:08 -0000 1.3 --- out4 31 Dec 2003 21:53:12 -0000 1.4 *************** *** 5,9 **** return False return ! Define.eval("{'heappush': <__main...ject at 0>}, {'heappush': <__main...ject at 0>}") Node.isgenerator('') return False --- 5,9 ---- return False return ! Define.eval("{'heappush': <Function object at 0>}, {'heappush': <Function object at 0>}") Node.isgenerator('') [...7278 lines suppressed...] return <built-in method pop of list object at 0> return 9 ! Name.assign("9, {'heappop': <Functio...nction object at 0>}, {'heap': []}") return return ! If.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}") ! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}") return [] ! Assign.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}") ! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}") return 9 ! Name.assign("9, {'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'heap': []}") return return return ! Return.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'returnitem': 9, 'heap': []}") ! Name.eval("{'heappop': <Functio...nction object at 0>}, {'lastelt': 9, 'returnitem': 9, 'heap': []}") return 9 ! raise <DoReturn instance at 0> [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]

1 0

python/nondist/sandbox/parrotbench t.py,1.1,1.2
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv6073 Modified Files: t.py Log Message: Simply set the recursion limit to 1001, since that's what we want. Index: t.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/t.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** t.py 31 Dec 2003 18:13:04 -0000 1.1 --- t.py 31 Dec 2003 21:51:48 -0000 1.2 *************** *** 1,4 **** import sys ! sys.setrecursionlimit(1 + sys.getrecursionlimit()) import time t0 = time.clock() --- 1,4 ---- import sys ! sys.setrecursionlimit(1001) import time t0 = time.clock()

1 0

Refill your medication online! yyjw l
by Cara Curtis 31 Dec '03

31 Dec '03

Rated Top Rated Online Store. HOT & NEW - Levitra/Lipitor/Nexium Weekly speciasls on all our drugs. -Zocor -Soma -Ambien -Phentermine -V1agra -Discount Generic's on ALL -MORE Next day discrete shipping on all products! http://www.rxstoreusa.biz/shopping Please, I wish to receive no more discounts on valuable items. http://www.rxstoreusa.biz/a.html jet djjdnjqj nldxi

1 0

python/dist/src/Python newcompile.c, 1.1.2.60, 1.1.2.61 ast.c, 1.1.2.39, 1.1.2.40
by nnorwitz＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv26003/Python Modified Files: Tag: ast-branch newcompile.c ast.c Log Message: get nested list comps and list comps with ifs to work Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.60 retrieving revision 1.1.2.61 diff -C2 -d -r1.1.2.60 -r1.1.2.61 *** newcompile.c 29 Dec 2003 22:10:41 -0000 1.1.2.60 --- newcompile.c 31 Dec 2003 20:26:36 -0000 1.1.2.61 *************** *** 26,33 **** 4: ! typing Ctrl-C seg faults 5: ! line numbers are off */ --- 26,37 ---- 4: ! line numbers are off a bit (may just need to add calls to set lineno 5: ! Modules/parsermodule.c:496: warning: implicit declaration ! of function `PyParser_SimpleParseString' ! ! 6: ! while loops with try/except in them don't work */ *************** *** 935,938 **** --- 939,946 ---- if there is no else clause ? */ + + /* sometimes this needs to be compiler_use_next_block + (e.g., nested loops), but if the code is + while XXX: try: ... this is correct */ compiler_use_block(c, anchor); ADDOP(c, POP_TOP); *************** *** 1228,1233 **** int i, n; ! fprintf(stderr, "compile stmt %d lineno %d\n", ! s->kind, s->lineno); c->u->u_lineno = s->lineno; c->u->u_lineno_set = false; --- 1236,1240 ---- int i, n; ! fprintf(stderr, "compile stmt %d lineno %d\n", s->kind, s->lineno); c->u->u_lineno = s->lineno; c->u->u_lineno_set = false; *************** *** 1677,1691 **** static int ! compiler_listcomp_generator(struct compiler *c, listcomp_ty l, expr_ty elt) { /* generate code for the iterator, then each of the ifs, and then write to the element */ ! int start, anchor, skip, i, n; start = compiler_new_block(c); skip = compiler_new_block(c); anchor = compiler_new_block(c); VISIT(c, expr, l->iter); ADDOP(c, GET_ITER); --- 1684,1703 ---- static int ! compiler_listcomp_generator(struct compiler *c, ! asdl_seq *generators, int gen_index, ! expr_ty elt) { /* generate code for the iterator, then each of the ifs, and then write to the element */ ! listcomp_ty l; ! int start, anchor, skip, if_cleanup, i, n; start = compiler_new_block(c); skip = compiler_new_block(c); + if_cleanup = compiler_new_block(c); anchor = compiler_new_block(c); + l = asdl_seq_GET(generators, gen_index); VISIT(c, expr, l->iter); ADDOP(c, GET_ITER); *************** *** 1694,1718 **** NEXT_BLOCK(c); VISIT(c, expr, l->target); ! n = asdl_seq_LEN(l->ifs); for (i = 0; i < n; i++) { expr_ty e = asdl_seq_GET(l->ifs, i); VISIT(c, expr, e); ! /* XXX not anchor? */ ! ADDOP_JREL(c, JUMP_IF_FALSE, skip); NEXT_BLOCK(c); ! ADDOP(c, DUP_TOP); } ! if (!compiler_nameop(c, c->u->u_tmp, Load)) return 0; ! VISIT(c, expr, elt); ! ADDOP_I(c, CALL_FUNCTION, 1); ! ADDOP(c, POP_TOP); ! compiler_use_next_block(c, skip); ADDOP_JABS(c, JUMP_ABSOLUTE, start); compiler_use_next_block(c, anchor); ! if (!compiler_nameop(c, c->u->u_tmp, Del)) return 0; --- 1706,1745 ---- NEXT_BLOCK(c); VISIT(c, expr, l->target); ! ! /* XXX this needs to be cleaned up...a lot! */ n = asdl_seq_LEN(l->ifs); for (i = 0; i < n; i++) { expr_ty e = asdl_seq_GET(l->ifs, i); VISIT(c, expr, e); ! ADDOP_JREL(c, JUMP_IF_FALSE, if_cleanup); NEXT_BLOCK(c); ! ADDOP(c, POP_TOP); } ! if (++gen_index < asdl_seq_LEN(generators)) ! if (!compiler_listcomp_generator(c, generators, gen_index, elt)) ! return 0; ! ! /* only append after the last for generator */ ! if (gen_index >= asdl_seq_LEN(generators)) { ! if (!compiler_nameop(c, c->u->u_tmp, Load)) return 0; ! VISIT(c, expr, elt); ! ADDOP_I(c, CALL_FUNCTION, 1); ! ADDOP(c, POP_TOP); ! compiler_use_next_block(c, skip); ! } ! for (i = 0; i < n; i++) { ! ADDOP_I(c, JUMP_FORWARD, 1); ! if (i == 0) ! compiler_use_next_block(c, if_cleanup); ! ADDOP(c, POP_TOP); ! } ADDOP_JABS(c, JUMP_ABSOLUTE, start); compiler_use_next_block(c, anchor); ! /* delete the append method added to locals */ ! if (gen_index == 1) ! if (!compiler_nameop(c, c->u->u_tmp, Del)) return 0; *************** *** 1723,1727 **** compiler_listcomp(struct compiler *c, expr_ty e) { - int i; char tmpname[256]; identifier tmp; --- 1750,1753 ---- *************** *** 1746,1755 **** return 0; c->u->u_tmp = tmp; ! for (i = 0; i < asdl_seq_LEN(generators); i++) { ! if (!compiler_listcomp_generator(c, ! asdl_seq_GET(generators, i), ! e->v.ListComp.elt)) ! return 0; ! } c->u->u_tmp = NULL; return 1; --- 1772,1777 ---- return 0; c->u->u_tmp = tmp; ! if (!compiler_listcomp_generator(c, generators, 0, e->v.ListComp.elt)) ! return 0; c->u->u_tmp = NULL; return 1; *************** *** 2476,2480 **** struct basicblock *b = c->u->u_blocks[a.a_postorder[i]]; fprintf(stderr, ! "\nblock %d: order=%d used=%d alloc=%d next=%d\n", i, a.a_postorder[i], b->b_iused, b->b_ialloc, b->b_next); --- 2498,2502 ---- struct basicblock *b = c->u->u_blocks[a.a_postorder[i]]; fprintf(stderr, ! "\nblock %d: order=%d used=%d alloc=%d next=%d\n", i, a.a_postorder[i], b->b_iused, b->b_ialloc, b->b_next); Index: ast.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/ast.c,v retrieving revision 1.1.2.39 retrieving revision 1.1.2.40 diff -C2 -d -r1.1.2.39 -r1.1.2.40 *** ast.c 29 Dec 2003 22:11:32 -0000 1.1.2.39 --- ast.c 31 Dec 2003 20:26:36 -0000 1.1.2.40 *************** *** 287,290 **** --- 287,297 ---- /* XXX It's not clear why were't getting into this code, although list comps seem like one possibility. + + This occurs in at least 2 cases: + [x(i) for i in range(3)] # Call_kind (8) + [i*2 for i in range(3)] # BinOp_kind (2) + + The byte code generated seems to work fine. + Maybe there's a problem with nested list comps? */ fprintf(stderr, "can't set context for %d\n", e->kind); *************** *** 713,724 **** REQ(ch, list_if); ! asdl_seq_APPEND(ifs, CHILD(ch, 1)); if (NCH(ch) == 3) ch = CHILD(ch, 2); } - /* XXX ifs is leaked, we surely have to do something with it */ /* on exit, must guarantee that ch is a list_for */ if (TYPE(ch) == list_iter) ch = CHILD(ch, 0); } asdl_seq_APPEND(listcomps, c); --- 720,731 ---- REQ(ch, list_if); ! asdl_seq_APPEND(ifs, ast_for_expr(CHILD(ch, 1))); if (NCH(ch) == 3) ch = CHILD(ch, 2); } /* on exit, must guarantee that ch is a list_for */ if (TYPE(ch) == list_iter) ch = CHILD(ch, 0); + c->ifs = ifs; } asdl_seq_APPEND(listcomps, c);

1 0

python/dist/src/Doc/lib emailmessage.tex, 1.13, 1.14 libcfgparser.tex, 1.32, 1.33 libos.tex, 1.132, 1.133 libsmtplib.tex, 1.25, 1.26
by rhettinger＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv7191 Modified Files: emailmessage.tex libcfgparser.tex libos.tex libsmtplib.tex Log Message: SF patch #859286: documentation bool change fix (Contributed by George Yoshida.) Index: emailmessage.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/emailmessage.tex,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** emailmessage.tex 31 Oct 2003 19:52:30 -0000 1.13 --- emailmessage.tex 31 Dec 2003 18:37:28 -0000 1.14 *************** *** 562,566 **** If the object's payload was already a list ! (i.e. \method{is_multipart()} returns 1), then \var{payload} is appended to the end of the existing payload list. --- 562,566 ---- If the object's payload was already a list ! (i.e. \method{is_multipart()} returns \code{True}), then \var{payload} is appended to the end of the existing payload list. Index: libcfgparser.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcfgparser.tex,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** libcfgparser.tex 15 Dec 2003 14:38:57 -0000 1.32 --- libcfgparser.tex 31 Dec 2003 18:37:28 -0000 1.33 *************** *** 166,171 **** \begin{methoddesc}{has_option}{section, option} ! If the given section exists, and contains the given option. return 1; ! otherwise return 0. \versionadded{1.6} \end{methoddesc} --- 166,171 ---- \begin{methoddesc}{has_option}{section, option} ! If the given section exists, and contains the given option, ! return \constant{True}; otherwise return \constant{False}. \versionadded{1.6} \end{methoddesc} *************** *** 246,250 **** Remove the specified \var{option} from the specified \var{section}. If the section does not exist, raise \exception{NoSectionError}. ! If the option existed to be removed, return 1; otherwise return 0. \versionadded{1.6} \end{methoddesc} --- 246,251 ---- Remove the specified \var{option} from the specified \var{section}. If the section does not exist, raise \exception{NoSectionError}. ! If the option existed to be removed, return \constant{True}; ! otherwise return \constant{False}. \versionadded{1.6} \end{methoddesc} Index: libos.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libos.tex,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** libos.tex 10 Nov 2003 06:46:15 -0000 1.132 --- libos.tex 31 Dec 2003 18:37:28 -0000 1.133 *************** *** 273,277 **** \end{funcdesc} ! % placed in this section since it relates to errno.... a little weak ;-( \begin{funcdesc}{strerror}{code} Return the error message corresponding to the error code in --- 273,277 ---- \end{funcdesc} ! % placed in this section since it relates to errno.... a little weak \begin{funcdesc}{strerror}{code} Return the error message corresponding to the error code in *************** *** 617,621 **** to test the existence of \var{path}, or it can be the inclusive OR of one or more of \constant{R_OK}, \constant{W_OK}, and \constant{X_OK} to ! test permissions. Return \code{1} if access is allowed, \code{0} if not. See the \UNIX{} man page \manpage{access}{2} for more information. Availability: \UNIX, Windows. --- 617,622 ---- to test the existence of \var{path}, or it can be the inclusive OR of one or more of \constant{R_OK}, \constant{W_OK}, and \constant{X_OK} to ! test permissions. Return \constant{True} if access is allowed, ! \constant{False} if not. See the \UNIX{} man page \manpage{access}{2} for more information. Availability: \UNIX, Windows. Index: libsmtplib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsmtplib.tex,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** libsmtplib.tex 22 Sep 2003 06:25:10 -0000 1.25 --- libsmtplib.tex 31 Dec 2003 18:37:28 -0000 1.26 *************** *** 147,152 **** \begin{methoddesc}{has_extn}{name} ! Return \code{1} if \var{name} is in the set of SMTP service extensions ! returned by the server, \code{0} otherwise. Case is ignored. \end{methoddesc} --- 147,153 ---- \begin{methoddesc}{has_extn}{name} ! Return \constant{True} if \var{name} is in the set of SMTP service ! extensions returned by the server, \constant{False} otherwise. ! Case is ignored. \end{methoddesc}

1 0

python/nondist/sandbox/parrotbench t.py,NONE,1.1
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv3581 Added Files: t.py Log Message: test driver for Windows. --- NEW FILE: t.py --- import sys sys.setrecursionlimit(1 + sys.getrecursionlimit()) import time t0 = time.clock() import b t1 = time.clock() print >>sys.stderr, "%.3f seconds" % (t1-t0)

1 0

[Python-checkins] python/nondist/sandbox/parrotbench README.txt, 1.3, 1.4
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv31878 Modified Files: README.txt Log Message: Update timing info. Index: README.txt =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README.txt 31 Dec 2003 16:38:33 -0000 1.3 --- README.txt 31 Dec 2003 17:45:32 -0000 1.4 *************** *** 74,78 **** which is a four-year-old 650 MHz Pentium box. If the contest hardware is so fast that it runs under a minute, there's a number in b.py that ! can be cranked up to increase the number of runs. --Guido van Rossum (home page: http://www.python.org/~guido/) --- 74,83 ---- which is a four-year-old 650 MHz Pentium box. If the contest hardware is so fast that it runs under a minute, there's a number in b.py that ! can be cranked up to increase the number of runs. (It takes 27 ! seconds on my recent work desktop, and on my screaming IBM T40 laptop ! it runs in 15 seconds, so I suspect that we should at least double the ! number of runs from 2 to 4.) ! ! December 31, 2003, --Guido van Rossum (home page: http://www.python.org/~guido/)

1 0

python/nondist/sandbox/parrotbench out5,1.5,1.6
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv21206 Modified Files: out5 Log Message: Updated output. Index: out5 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out5,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** out5 31 Dec 2003 07:54:58 -0000 1.5 --- out5 31 Dec 2003 16:47:37 -0000 1.6 *************** *** 1,7 **** ! 42 == 42 ! 42 == 42 ! 12345678910L == 12345678910L ! 3.1400000000000001 == 3.1400000000000001 ! 5.0 == 5 True == True True == True --- 1,7 ---- ! 0 == 0L ! 0 == 0L ! 0L == 0L ! 0.0 == 0.0 ! 0.0 == 0L True == True True == True *************** *** 11,15 **** True == True False == False ! (3+4j) == (3+4j) {1: 2, 3: 4} == {1: 2, 3: 4} {'a': None, 'c': None, 'b': None} == {'a': None, 'c': None, 'b': None} --- 11,15 ---- True == True False == False ! 0j == 0j {1: 2, 3: 4} == {1: 2, 3: 4} {'a': None, 'c': None, 'b': None} == {'a': None, 'c': None, 'b': None} *************** *** 19,23 **** [0, 1, 2, 3, 4] == [0, 1, 2, 3, 4] 1.5 == 1.5 ! 15.0 == 15.0 1e+100 == 1e+100 42 == 42 --- 19,23 ---- [0, 1, 2, 3, 4] == [0, 1, 2, 3, 4] 1.5 == 1.5 ! 0.0 == 0.0 1e+100 == 1e+100 42 == 42

1 0

python/nondist/sandbox/parrotbench b5.py,1.4,1.5
by gvanrossum＠users.sourceforge.net 31 Dec '03

31 Dec '03

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv20841 Modified Files: b5.py Log Message: Add some variation. Index: b5.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b5.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** b5.py 31 Dec 2003 07:54:58 -0000 1.4 --- b5.py 31 Dec 2003 16:45:36 -0000 1.5 *************** *** 21,40 **** exc.__name__, f.__name__, args) ! def check_functions(): ! check(abs(42), 42) ! check(abs(-42), 42) ! check(abs(-12345678910), 12345678910) ! check(abs(-3.14), 3.14) ! check(abs(3j+4), 5) ! check(bool(1), True) ! check(bool(100), True) ! check(bool(0), False) ! check(bool([1,2,3]), True) ! check(bool([]), False) ! check(bool({1: 2}), True) check(bool({}), False) ! check(complex(3, 4), 3+4j) check(dict([(1,2), (3,4)]), {1: 2, 3: 4}) --- 21,40 ---- exc.__name__, f.__name__, args) ! def check_functions(i=0, j=0): ! check(abs(42*i), 42*j) ! check(abs(-42*i), 42*j) ! check(abs(-12345678910*i), 12345678910*j) ! check(abs(-3.14*i), 3.14*i) ! check(abs((3j+4)*i), 5*j) ! check(bool(1+i), True) ! check(bool(100+j), True) ! check(bool(i-j), False) ! check(bool([i, j]), True) ! check(bool([i, j][i:j]), False) ! check(bool({i: j}), True) check(bool({}), False) ! check(complex(3*i, 4*j), 3*i+4j*j) check(dict([(1,2), (3,4)]), {1: 2, 3: 4}) *************** *** 49,53 **** check(float("1.5"), 1.5) ! check(float(15), 15.0) check(float(10**100), 1e100) --- 49,53 ---- check(float("1.5"), 1.5) ! check(float(15*i), 15.0*j) check(float(10**100), 1e100) *************** *** 238,242 **** [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')]) ! def check_descriptors(): class C0(object): --- 238,242 ---- [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')]) ! def check_descriptors(i, j): class C0(object): *************** *** 365,370 **** show = True for i in range(500): ! check_functions() ! check_descriptors() show = False print "OK." --- 365,370 ---- show = True for i in range(500): ! check_functions(j=long(i*1000000), i=i*1000000) ! check_descriptors(j=long(i*1000000), i=i*1000000) show = False print "OK."

1 0