Mailman 3 October 2004 - Python-checkins

python/dist/src LICENSE,1.32,1.33
by tim_one＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1160 Modified Files: LICENSE Log Message: In paragraph 1, changed Python software to this software ("Python") Index: LICENSE =================================================================== RCS file: /cvsroot/python/python/dist/src/LICENSE,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- LICENSE 23 Oct 2004 03:48:57 -0000 1.32 +++ LICENSE 26 Oct 2004 14:38:48 -0000 1.33 @@ -74,8 +74,8 @@ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python software in source or binary form and its -associated documentation. +otherwise using this software ("Python") in source or binary form and +its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide

1 0

python/dist/src/Lib/test test_plistlib.py, 1.4, 1.5
by jvr＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9073 Modified Files: test_plistlib.py Log Message: - Added tests for the string load/dump function. - Added a chunk of plist data as generated by Cocoa's NSDictionary and verify we output the same (including formatting) - Changed the "literal" plist code to match the raw test data Index: test_plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_plistlib.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- test_plistlib.py 2 Oct 2004 14:06:18 -0000 1.4 +++ test_plistlib.py 26 Oct 2004 11:02:08 -0000 1.5 @@ -3,8 +3,91 @@ import unittest import plistlib import os +import time +import datetime from test import test_support + +# This test data was generated through Cocoa's NSDictionary class +TESTDATA = """<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" \ +"http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>aDate</key> + <date>2004-10-26T10:33:33Z</date> + <key>aDict</key> + <dict> + <key>aFalseValue</key> + <false/> + <key>aTrueValue</key> + <true/> + <key>aUnicodeValue</key> + <string>M\xc3\xa4ssig, Ma\xc3\x9f</string> + <key>anotherString</key> + <string><hello & 'hi' there!></string> + <key>deeperDict</key> + <dict> + <key>a</key> + <integer>17</integer> + <key>b</key> + <real>32.5</real> + <key>c</key> + <array> + <integer>1</integer> + <integer>2</integer> + <string>text</string> + </array> + </dict> + </dict> + <key>aFloat</key> + <real>0.5</real> + <key>aList</key> + <array> + <string>A</string> + <string>B</string> + <integer>12</integer> + <real>32.5</real> + <array> + <integer>1</integer> + <integer>2</integer> + <integer>3</integer> + </array> + </array> + <key>aString</key> + <string>Doodah</string> + <key>anInt</key> + <integer>728</integer> + <key>nestedData</key> + <array> + <data> + PGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAzxsb3RzIG9mIGJpbmFyeSBndW5r + PgABAgM8bG90cyBvZiBiaW5hcnkgZ3Vuaz4AAQIDPGxvdHMgb2YgYmluYXJ5 + IGd1bms+AAECAzxsb3RzIG9mIGJpbmFyeSBndW5rPgABAgM8bG90cyBvZiBi + aW5hcnkgZ3Vuaz4AAQIDPGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAzxsb3Rz + IG9mIGJpbmFyeSBndW5rPgABAgM8bG90cyBvZiBiaW5hcnkgZ3Vuaz4AAQID + PGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAw== + </data> + </array> + <key>someData</key> + <data> + PGJpbmFyeSBndW5rPg== + </data> + <key>someMoreData</key> + <data> + PGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAzxsb3RzIG9mIGJpbmFyeSBndW5rPgABAgM8 + bG90cyBvZiBiaW5hcnkgZ3Vuaz4AAQIDPGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAzxs + b3RzIG9mIGJpbmFyeSBndW5rPgABAgM8bG90cyBvZiBiaW5hcnkgZ3Vuaz4AAQIDPGxv + dHMgb2YgYmluYXJ5IGd1bms+AAECAzxsb3RzIG9mIGJpbmFyeSBndW5rPgABAgM8bG90 + cyBvZiBiaW5hcnkgZ3Vuaz4AAQIDPGxvdHMgb2YgYmluYXJ5IGd1bms+AAECAw== + </data> + <key>\xc3\x85benraa</key> + <string>That was a unicode key.</string> +</dict> +</plist> +""".replace(" " * 8, "\t") # Apple as well as plistlib.py output hard tabs + + class TestPlistlib(unittest.TestCase): def tearDown(self): @@ -14,28 +97,24 @@ pass def _create(self): - pl = plistlib.Dict( + pl = dict( aString="Doodah", - aList=["A", "B", 12, 32.1, [1, 2, 3]], - aFloat = 0.1, + aList=["A", "B", 12, 32.5, [1, 2, 3]], + aFloat = 0.5, anInt = 728, - aDict=plistlib.Dict( - anotherString="<hello & hi there!>", + aDict=dict( + anotherString="<hello & 'hi' there!>", aUnicodeValue=u'M\xe4ssig, Ma\xdf', aTrueValue=True, aFalseValue=False, + deeperDict=dict(a=17, b=32.5, c=[1, 2, "text"]), ), someData = plistlib.Data("<binary gunk>"), - someMoreData = plistlib.Data("<lots of binary gunk>" * 10), + someMoreData = plistlib.Data("<lots of binary gunk>\0\1\2\3" * 10), + nestedData = [plistlib.Data("<lots of binary gunk>\0\1\2\3" * 10)], + aDate = datetime.datetime(2004, 10, 26, 10, 33, 33), ) - pl['anotherInt'] = 42 - try: - from xml.utils.iso8601 import parse - import time - except ImportError: - pass - else: - pl['aDate'] = plistlib.Date(time.mktime(time.gmtime())) + pl[u'\xc5benraa'] = "That was a unicode key." return pl def test_create(self): @@ -49,6 +128,26 @@ pl2 = plistlib.readPlist(test_support.TESTFN) self.assertEqual(dict(pl), dict(pl2)) + def test_string(self): + pl = self._create() + data = plistlib.writePlistToString(pl) + pl2 = plistlib.readPlistFromString(data) + self.assertEqual(dict(pl), dict(pl2)) + data2 = plistlib.writePlistToString(pl2) + self.assertEqual(data, data2) + + def test_appleformatting(self): + pl = plistlib.readPlistFromString(TESTDATA) + data = plistlib.writePlistToString(pl) + self.assertEqual(data, TESTDATA, + "generated data was not identical to Apple's output") + + def test_appleformattingfromliteral(self): + pl = self._create() + pl2 = plistlib.readPlistFromString(TESTDATA) + self.assertEqual(dict(pl), dict(pl2), + "generated data was not identical to Apple's output") + def test_stringio(self): from StringIO import StringIO f = StringIO()

1 0

python/dist/src/Lib/plat-mac plistlib.py, 1.14, 1.15
by jvr＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3138 Modified Files: plistlib.py Log Message: Made <data> output match Apple's exactly. To do that I had to add a custom version of base64.encodestring() so I could control the line length of the base64 output. Index: plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- plistlib.py 26 Oct 2004 10:11:00 -0000 1.14 +++ plistlib.py 26 Oct 2004 10:30:55 -0000 1.15 @@ -58,7 +58,7 @@ ] # Note: the Plist and Dict classes have been deprecated. -import base64 +import binascii import datetime from cStringIO import StringIO @@ -252,9 +252,13 @@ def writeData(self, data): self.beginElement("data") - for line in data.asBase64().split("\n"): + self.indentLevel -= 1 + maxlinelength = 76 - len(self.indent.replace("\t", " " * 8) * + self.indentLevel) + for line in data.asBase64(maxlinelength).split("\n"): if line: self.writeln(line) + self.indentLevel += 1 self.endElement("data") def writeDict(self, d): @@ -317,7 +321,7 @@ class Plist(_InternalDict): - """This class has been deprecated. Use readPlist() and writePlist() + """This class has been deprecated. Use readPlist() and writePlist() functions instead, together with regular dict objects. """ @@ -340,6 +344,15 @@ writePlist(self, pathOrFile) +def _encodeBase64(s, maxlinelength=76): + # copied from base64.encodestring(), with added maxlinelength argument + maxbinsize = (maxlinelength//4)*3 + pieces = [] + for i in range(0, len(s), maxbinsize): + chunk = s[i : i + maxbinsize] + pieces.append(binascii.b2a_base64(chunk)) + return "".join(pieces) + class Data: """Wrapper for binary data.""" @@ -348,11 +361,13 @@ self.data = data def fromBase64(cls, data): - return cls(base64.decodestring(data)) + # base64.decodestring just calls binascii.a2b_base64; + # it seems overkill to use both base64 and binascii. + return cls(binascii.a2b_base64(data)) fromBase64 = classmethod(fromBase64) - def asBase64(self): - return base64.encodestring(self.data) + def asBase64(self, maxlinelength=76): + return _encodeBase64(self.data, maxlinelength) def __cmp__(self, other): if isinstance(other, self.__class__):

1 0

python/dist/src/Lib/plat-mac plistlib.py, 1.13, 1.14
by jvr＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30919 Modified Files: plistlib.py Log Message: also escape '>', to closer match Apple's plist output Index: plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- plistlib.py 26 Oct 2004 07:38:16 -0000 1.13 +++ plistlib.py 26 Oct 2004 10:11:00 -0000 1.14 @@ -208,6 +208,7 @@ text = text.replace("\r", "\n") # convert Mac line endings text = text.replace("&", "&") # escape '&' text = text.replace("<", "<") # escape '<' + text = text.replace(">", ">") # escape '>' text = _controlStripper.sub("?", text) # replace control chars with '?' return text.encode("utf-8") # encode as UTF-8

1 0

python/dist/src/Misc NEWS,1.1177,1.1178
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27686/Misc Modified Files: NEWS Log Message: Patch #1044395: Allow configure option --enable-shared in FreeBSD. (Submitted by James William Pye, Patch revised by Jiwon Seo) Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1177 retrieving revision 1.1178 diff -u -d -r1.1177 -r1.1178 --- NEWS 26 Oct 2004 09:16:42 -0000 1.1177 +++ NEWS 26 Oct 2004 09:53:46 -0000 1.1178 @@ -59,13 +59,13 @@ - Bug #1017553: fix bug in tarfile.filemode() -- Bug #737473: fix bug that old source code is shown in tracebacks even if +- Patch #737473: fix bug that old source code is shown in tracebacks even if the source code is updated and reloaded. Build ----- -... +- Patch #1044395: --enable-shared is allowed in FreeBSD also. C API -----

1 0

python/dist/src configure.in, 1.472, 1.473 configure, 1.459, 1.460
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27686 Modified Files: configure.in configure Log Message: Patch #1044395: Allow configure option --enable-shared in FreeBSD. (Submitted by James William Pye, Patch revised by Jiwon Seo) Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.472 retrieving revision 1.473 diff -u -d -r1.472 -r1.473 --- configure.in 13 Oct 2004 15:30:55 -0000 1.472 +++ configure.in 26 Oct 2004 09:53:40 -0000 1.473 @@ -557,10 +557,15 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*) + Linux*|GNU*|NetBSD*|FreeBSD*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + case $ac_sys_system in + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; + esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) @@ -1345,7 +1350,7 @@ OpenBSD*|FreeBSD*) if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]] then - LDSHARED="cc -shared ${LDFLAGS}" + LDSHARED="$CC -shared ${LDFLAGS}" else LDSHARED="ld -Bshareable ${LDFLAGS}" fi;; Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.459 retrieving revision 1.460 diff -u -d -r1.459 -r1.460 --- configure 13 Oct 2004 15:30:45 -0000 1.459 +++ configure 26 Oct 2004 09:53:40 -0000 1.460 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.471 . +# From configure.in Revision: 1.472 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.4. # @@ -3392,10 +3392,15 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*) + Linux*|GNU*|NetBSD*|FreeBSD*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + case $ac_sys_system in + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; + esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) @@ -10332,7 +10337,7 @@ OpenBSD*|FreeBSD*) if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ] then - LDSHARED="cc -shared ${LDFLAGS}" + LDSHARED="$CC -shared ${LDFLAGS}" else LDSHARED="ld -Bshareable ${LDFLAGS}" fi;;

1 0

python/dist/src/Misc NEWS,1.1176,1.1177
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19767/Misc Modified Files: NEWS Log Message: SF #737473: Show up-to-date source code in tracebacks always. And add an optional argument 'filename' to linecache.checkcache() to enable checking caches per-file. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1176 retrieving revision 1.1177 diff -u -d -r1.1176 -r1.1177 --- NEWS 26 Oct 2004 01:52:36 -0000 1.1176 +++ NEWS 26 Oct 2004 09:16:42 -0000 1.1177 @@ -59,6 +59,9 @@ - Bug #1017553: fix bug in tarfile.filemode() +- Bug #737473: fix bug that old source code is shown in tracebacks even if + the source code is updated and reloaded. + Build -----

1 0

python/dist/src/Lib/test test_traceback.py, 1.7, 1.8
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19767/Lib/test Modified Files: test_traceback.py Log Message: SF #737473: Show up-to-date source code in tracebacks always. And add an optional argument 'filename' to linecache.checkcache() to enable checking caches per-file. Index: test_traceback.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_traceback.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_traceback.py 6 Nov 2002 11:45:15 -0000 1.7 +++ test_traceback.py 26 Oct 2004 09:16:41 -0000 1.8 @@ -40,6 +40,47 @@ self.assert_(len(err) == 3) self.assert_(err[1].strip() == "[x for x in x] = x") + def test_bug737473(self): + import sys, os, tempfile + savedpath = sys.path[:] + testdir = tempfile.mkdtemp() + try: + sys.path.insert(0, testdir) + testfile = os.path.join(testdir, 'test_bug737473.py') + print >> open(testfile, 'w'), """\ +def test(): + raise ValueError""" + + if hasattr(os, 'utime'): + os.utime(testfile, (0, 0)) + else: + import time + time.sleep(3) # not to stay in same mtime. + + if 'test_bug737473' in sys.modules: + del sys.modules['test_bug737473'] + import test_bug737473 + + try: + test_bug737473.test() + except ValueError: + # this loads source code to linecache + traceback.extract_tb(sys.exc_traceback) + + print >> open(testfile, 'w'), """\ +def test(): + raise NotImplementedError""" + reload(test_bug737473) + try: + test_bug737473.test() + except NotImplementedError: + src = traceback.extract_tb(sys.exc_traceback)[-1][-1] + self.failUnlessEqual(src, 'raise NotImplementedError') + finally: + sys.path[:] = savedpath + for f in os.listdir(testdir): + os.unlink(os.path.join(testdir, f)) + os.rmdir(testdir) def test_main(): run_unittest(TracebackCases)

1 0

python/dist/src/Lib linecache.py, 1.12, 1.13 traceback.py, 1.30, 1.31
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19767/Lib Modified Files: linecache.py traceback.py Log Message: SF #737473: Show up-to-date source code in tracebacks always. And add an optional argument 'filename' to linecache.checkcache() to enable checking caches per-file. Index: linecache.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/linecache.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- linecache.py 29 Jun 2003 16:59:43 -0000 1.12 +++ linecache.py 26 Oct 2004 09:16:41 -0000 1.13 @@ -40,11 +40,19 @@ return updatecache(filename) -def checkcache(): +def checkcache(filename=None): """Discard cache entries that are out of date. (This is not checked upon each call!)""" - for filename in cache.keys(): + if filename is None: + filenames = cache.keys() + else: + if filename in cache: + filenames = [filename] + else: + return + + for filename in filenames: size, mtime, lines, fullname = cache[filename] try: stat = os.stat(fullname) Index: traceback.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/traceback.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- traceback.py 18 Jan 2004 20:29:54 -0000 1.30 +++ traceback.py 26 Oct 2004 09:16:41 -0000 1.31 @@ -65,6 +65,7 @@ name = co.co_name _print(file, ' File "%s", line %d, in %s' % (filename,lineno,name)) + linecache.checkcache(filename) line = linecache.getline(filename, lineno) if line: _print(file, ' ' + line.strip()) tb = tb.tb_next @@ -96,6 +97,7 @@ co = f.f_code filename = co.co_filename name = co.co_name + linecache.checkcache(filename) line = linecache.getline(filename, lineno) if line: line = line.strip() else: line = None @@ -277,6 +279,7 @@ co = f.f_code filename = co.co_filename name = co.co_name + linecache.checkcache(filename) line = linecache.getline(filename, lineno) if line: line = line.strip() else: line = None

1 0

python/dist/src/Doc/lib liblinecache.tex,1.5,1.6
by perky＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19767/Doc/lib Modified Files: liblinecache.tex Log Message: SF #737473: Show up-to-date source code in tracebacks always. And add an optional argument 'filename' to linecache.checkcache() to enable checking caches per-file. Index: liblinecache.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblinecache.tex,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- liblinecache.tex 24 Jan 2001 17:19:05 -0000 1.5 +++ liblinecache.tex 26 Oct 2004 09:16:41 -0000 1.6 @@ -31,9 +31,10 @@ files previously read using \function{getline()}. \end{funcdesc} -\begin{funcdesc}{checkcache}{} +\begin{funcdesc}{checkcache}{\optional{filename}} Check the cache for validity. Use this function if files in the cache -may have changed on disk, and you require the updated version. +may have changed on disk, and you require the updated version. If +\var{filename} is omitted, it will check the whole cache entries. \end{funcdesc} Example:

1 0