Mailman 3 October 2004 - Python-checkins

python/dist/src/Lib/test test_peepholer.py, 1.3, 1.4
by rhettinger＠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-serv15896/Lib/test Modified Files: test_peepholer.py Log Message: SF bug #1053819: Segfault in tuple_of_constants Peepholer could be fooled into misidentifying a tuple_of_constants. Added code to count consecutive occurrences of LOAD_CONST. Use the count to weed out the misidentified cases. Added a unittest. Index: test_peepholer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_peepholer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test_peepholer.py 22 Sep 2004 18:44:08 -0000 1.3 +++ test_peepholer.py 26 Oct 2004 08:59:14 -0000 1.4 @@ -83,6 +83,23 @@ self.assert_(elem in asm) self.assert_('BUILD_TUPLE' not in asm) + # Bug 1053819: Tuple of constants misidentified when presented with: + # . . . opcode_with_arg 100 unary_opcode BUILD_TUPLE 1 . . . + # The following would segfault upon compilation + def crater(): + (~[ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + ],) + def test_elim_extra_return(self): # RETURN LOAD_CONST None RETURN --> RETURN def f(x):

1 0

python/dist/src/Python compile.c,2.331,2.332
by rhettinger＠users.sourceforge.net 26 Oct '04

26 Oct '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15896/Python Modified Files: compile.c Log Message: SF bug #1053819: Segfault in tuple_of_constants Peepholer could be fooled into misidentifying a tuple_of_constants. Added code to count consecutive occurrences of LOAD_CONST. Use the count to weed out the misidentified cases. Added a unittest. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.331 retrieving revision 2.332 diff -u -d -r2.331 -r2.332 --- compile.c 24 Oct 2004 00:10:05 -0000 2.331 +++ compile.c 26 Oct 2004 08:59:13 -0000 2.332 @@ -419,15 +419,16 @@ newconst = PyTuple_New(n); if (newconst == NULL) return 0; + len_consts = PyList_GET_SIZE(consts); for (i=0 ; i<n ; i++) { arg = GETARG(codestr, (i*3)); + assert(arg < len_consts); constant = PyList_GET_ITEM(consts, arg); Py_INCREF(constant); PyTuple_SET_ITEM(newconst, i, constant); } /* Append folded constant onto consts */ - len_consts = PyList_GET_SIZE(consts); if (PyList_Append(consts, newconst)) { Py_DECREF(newconst); return 0; @@ -501,6 +502,7 @@ unsigned char *lineno; int *addrmap = NULL; int new_line, cum_orig_line, last_line, tabsiz; + int cumlc=0, lastlc=0; /* Count runs of consecutive LOAD_CONST codes */ unsigned int *blocks; char *name; @@ -536,6 +538,10 @@ for (i=0, nops=0 ; i<codelen ; i += CODESIZE(codestr[i])) { addrmap[i] = i - nops; opcode = codestr[i]; + + lastlc = cumlc; + cumlc = 0; + switch (opcode) { /* Replace UNARY_NOT JUMP_IF_FALSE POP_TOP with @@ -589,6 +595,7 @@ /* Skip over LOAD_CONST trueconst JUMP_IF_FALSE xx POP_TOP */ case LOAD_CONST: + cumlc = lastlc + 1; j = GETARG(codestr, i); if (codestr[i+3] != JUMP_IF_FALSE || codestr[i+6] != POP_TOP || @@ -607,6 +614,7 @@ j = GETARG(codestr, i); h = i - 3 * j; if (h >= 0 && + j == lastlc && codestr[h] == LOAD_CONST && ISBASICBLOCK(blocks, h, 3*(j+1)) && tuple_of_constants(&codestr[h], j, consts)) {

1 0

python/dist/src/Lib/plat-mac plistlib.py, 1.12, 1.13
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-serv32063 Modified Files: plistlib.py Log Message: Deprecating Dict class; going through a few hoops to get the warnings right. Index: plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- plistlib.py 26 Oct 2004 07:20:26 -0000 1.12 +++ plistlib.py 26 Oct 2004 07:38:16 -0000 1.13 @@ -20,23 +20,17 @@ dictionary keys) may be unicode strings -- they will be written out as UTF-8. -This module exports a class named Dict(), which allows you to easily -construct (nested) dicts using keyword arguments as well as accessing -values with attribute notation, where d.foo is equivalent to d["foo"]. -Regular dictionaries work, too. Dictionaries are always represented with -Dict instances when loading plist data. - The <data> plist type is supported through the Data class. This is a thin wrapper around a Python string. Generate Plist example: - pl = Dict( + pl = dict( aString="Doodah", aList=["A", "B", 12, 32.1, [1, 2, 3]], aFloat = 0.1, anInt = 728, - aDict=Dict( + aDict=dict( anotherString="<hello & hi there!>", aUnicodeValue=u'M\xe4ssig, Ma\xdf', aTrueValue=True, @@ -53,9 +47,7 @@ Parse Plist example: pl = readPlist(pathOrFile) - print pl.aKey # same as pl["aKey"] - - + print pl["aKey"] """ @@ -64,7 +56,7 @@ "readPlistFromResource", "writePlistToResource", "Plist", "Data", "Dict" ] -# Note: the Plist class has been deprecated. +# Note: the Plist and Dict classes have been deprecated. import base64 import datetime @@ -282,20 +274,26 @@ self.endElement("array") -class Dict(dict): +class _InternalDict(dict): - """Convenience dictionary subclass: it allows attribute notation - to retrieve values, making d.foo equivalent to d["foo"]. - """ + # This class is needed while Dict is scheduled for deprecation: + # we only need to warn when a *user* instantiates Dict or when + # the "attribute notation for dict keys" is used. def __getattr__(self, attr): try: value = self[attr] except KeyError: raise AttributeError, attr + from warnings import warn + warn("Attribute access from plist dicts is deprecated, use d[key] " + "notation instead", PendingDeprecationWarning) return value def __setattr__(self, attr, value): + from warnings import warn + warn("Attribute access from plist dicts is deprecated, use d[key] " + "notation instead", PendingDeprecationWarning) self[attr] = value def __delattr__(self, attr): @@ -303,12 +301,23 @@ del self[attr] except KeyError: raise AttributeError, attr + from warnings import warn + warn("Attribute access from plist dicts is deprecated, use d[key] " + "notation instead", PendingDeprecationWarning) +class Dict(_InternalDict): -class Plist(Dict): + def __init__(self, **kwargs): + from warnings import warn + warn("The plistlib.Dict class is deprecated, use builtin dict instead", + PendingDeprecationWarning) + super(Dict, self).__init__(**kwargs) - """This class has been deprecated. Use the Dict with readPlist() and - writePlist() functions instead. + +class Plist(_InternalDict): + + """This class has been deprecated. Use readPlist() and writePlist() + functions instead, together with regular dict objects. """ def __init__(self, **kwargs): @@ -408,7 +417,7 @@ # element handlers def begin_dict(self, attrs): - d = Dict() + d = _InternalDict() self.addObject(d) self.stack.append(d) def end_dict(self):

1 0

python/dist/src/Lib/plat-mac plistlib.py, 1.11, 1.12
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-serv27764 Modified Files: plistlib.py Log Message: - Removed Date class. We don't really need it for b/w compatibility since a) the functionality depended on PyXML before and b) hardly worked to begin with. - Instead, output and require upon input datetime.datetime objects. Index: plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- plistlib.py 26 Oct 2004 06:50:50 -0000 1.11 +++ plistlib.py 26 Oct 2004 07:20:26 -0000 1.12 @@ -16,8 +16,9 @@ and writePlistToString(). Values can be strings, integers, floats, booleans, tuples, lists, -dictionaries, Data or Date objects. String values (including dictionary -keys) may be unicode strings -- they will be written out as UTF-8. +dictionaries, Data or datetime.datetime objects. String values (including +dictionary keys) may be unicode strings -- they will be written out as +UTF-8. This module exports a class named Dict(), which allows you to easily construct (nested) dicts using keyword arguments as well as accessing @@ -28,8 +29,6 @@ The <data> plist type is supported through the Data class. This is a thin wrapper around a Python string. -The <date> plist data has support through the Date class. - Generate Plist example: pl = Dict( @@ -45,7 +44,7 @@ ), someData = Data("<binary gunk>"), someMoreData = Data("<lots of binary gunk>" * 10), - aDate = Date(time.mktime(time.gmtime())), + aDate = datetime.datetime.fromtimestamp(time.mktime(time.gmtime())), ) # unicode keys are possible, but a little awkward to use: pl[u'\xc5benraa'] = "That was a unicode key." @@ -63,7 +62,7 @@ __all__ = [ "readPlist", "writePlist", "readPlistFromString", "writePlistToString", "readPlistFromResource", "writePlistToResource", - "Plist", "Data", "Date", "Dict" + "Plist", "Data", "Dict" ] # Note: the Plist class has been deprecated. @@ -195,6 +194,23 @@ # a loss of precision) _dateParser = re.compile(r"(?P<year>\d\d\d\d)(?:-(?P<month>\d\d)(?:-(?P<day>\d\d)(?:T(?P<hour>\d\d)(?::(?P<minute>\d\d)(?::(?P<second>\d\d))?)?)?)?)?Z") +def _dateFromString(s): + order = ('year', 'month', 'day', 'hour', 'minute', 'second') + gd = _dateParser.match(s).groupdict() + lst = [] + for key in order: + val = gd[key] + if val is None: + break + lst.append(int(val)) + return datetime.datetime(*lst) + +def _dateToString(d): + return '%04d-%02d-%02dT%02d:%02d:%02dZ' % ( + d.year, d.month, d.day, + d.hour, d.minute, d.second + ) + def _escapeAndEncode(text): text = text.replace("\r\n", "\n") # convert DOS line endings text = text.replace("\r", "\n") # convert Mac line endings @@ -234,8 +250,8 @@ self.writeDict(value) elif isinstance(value, Data): self.writeData(value) - elif isinstance(value, Date): - self.simpleElement("date", value.toString()) + elif isinstance(value, datetime.datetime): + self.simpleElement("date", _dateToString(value)) elif isinstance(value, (tuple, list)): self.writeArray(value) else: @@ -340,49 +356,6 @@ return "%s(%s)" % (self.__class__.__name__, repr(self.data)) -class Date: - - """Primitive date wrapper, uses UTC datetime instances internally. - """ - - def __init__(self, date): - if isinstance(date, datetime.datetime): - pass - elif isinstance(date, (float, int)): - date = datetime.datetime.fromtimestamp(date) - elif isinstance(date, basestring): - order = ('year', 'month', 'day', 'hour', 'minute', 'second') - gd = _dateParser.match(date).groupdict() - lst = [] - for key in order: - val = gd[key] - if val is None: - break - lst.append(int(val)) - date = datetime.datetime(*lst) - else: - raise ValueError, "Can't convert %r to datetime" % (date,) - self.date = date - - def toString(self): - d = self.date - return '%04d-%02d-%02dT%02d:%02d:%02dZ' % ( - d.year, d.month, d.day, - d.second, d.minute, d.hour, - ) - - def __cmp__(self, other): - if isinstance(other, self.__class__): - return cmp(self.date, other.date) - elif isinstance(other, (datetime.datetime, float, int, basestring)): - return cmp(self.date, Date(other).date) - else: - return cmp(id(self), id(other)) - - def __repr__(self): - return "%s(%s)" % (self.__class__.__name__, repr(self.toString())) - - class PlistParser: def __init__(self): @@ -464,4 +437,4 @@ def end_data(self): self.addObject(Data.fromBase64(self.getData())) def end_date(self): - self.addObject(Date(self.getData())) + self.addObject(_dateFromString(self.getData()))

1 0

python/dist/src/Lib/plat-mac plistlib.py, 1.10, 1.11
by jvr＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/plat-mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22137 Modified Files: plistlib.py Log Message: - added two more convenience functions: readPlistFromString() and writePlistToString() - use these two in the resource functions. - Tweaked module doc string. Index: plistlib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- plistlib.py 25 Oct 2004 16:10:53 -0000 1.10 +++ plistlib.py 26 Oct 2004 06:50:50 -0000 1.11 @@ -8,9 +8,12 @@ function. 'rootObject' is the top level object, 'pathOrFile' is a filename or a (writable) file object. -To parse a plist from a file, use the readPlist(pathOrFile) -function, with a file name or a (readable) file object as the only -argument. It returns the top level object (usually a dictionary). +To parse a plist from a file, use the readPlist(pathOrFile) function, +with a file name or a (readable) file object as the only argument. It +returns the top level object (again, usually a dictionary). + +To work with plist data in strings, you can use readPlistFromString() +and writePlistToString(). Values can be strings, integers, floats, booleans, tuples, lists, dictionaries, Data or Date objects. String values (including dictionary @@ -19,13 +22,13 @@ This module exports a class named Dict(), which allows you to easily construct (nested) dicts using keyword arguments as well as accessing values with attribute notation, where d.foo is equivalent to d["foo"]. -Regular dictionaries work, too. +Regular dictionaries work, too. Dictionaries are always represented with +Dict instances when loading plist data. The <data> plist type is supported through the Data class. This is a thin wrapper around a Python string. -The <date> plist data has (limited) support through the Date class. -(Warning: Dates are only supported if the PyXML package is installed.) +The <date> plist data has support through the Date class. Generate Plist example: @@ -58,13 +61,15 @@ __all__ = [ - "readPlist", "writePlist", + "readPlist", "writePlist", "readPlistFromString", "writePlistToString", "readPlistFromResource", "writePlistToResource", "Plist", "Data", "Date", "Dict" ] # Note: the Plist class has been deprecated. -import base64, datetime +import base64 +import datetime +from cStringIO import StringIO def readPlist(pathOrFile): @@ -99,19 +104,32 @@ pathOrFile.close() +def readPlistFromString(data): + """Read a plist data from a string. Return the root object. + """ + return readPlist(StringIO(data)) + + +def writePlistToString(rootObject): + """Return 'rootObject' as a plist-formatted string. + """ + f = StringIO() + writePlist(rootObject, f) + return f.getvalue() + + def readPlistFromResource(path, restype='plst', resid=0): """Read plst resource from the resource fork of path. """ from Carbon.File import FSRef, FSGetResourceForkName from Carbon.Files import fsRdPerm from Carbon import Res - from cStringIO import StringIO fsRef = FSRef(path) resNum = Res.FSOpenResourceFile(fsRef, FSGetResourceForkName(), fsRdPerm) Res.UseResFile(resNum) - plistData = StringIO(Res.Get1Resource(restype, resid).data) + plistData = Res.Get1Resource(restype, resid).data Res.CloseResFile(resNum) - return readPlist(plistData) + return readPlistFromString(plistData) def writePlistToResource(rootObject, path, restype='plst', resid=0): @@ -120,10 +138,7 @@ from Carbon.File import FSRef, FSGetResourceForkName from Carbon.Files import fsRdWrPerm from Carbon import Res - from cStringIO import StringIO - plistData = StringIO() - writePlist(rootObject, plistData) - plistData = plistData.getvalue() + plistData = writePlistToString(rootObject) fsRef = FSRef(path) resNum = Res.FSOpenResourceFile(fsRef, FSGetResourceForkName(), fsRdWrPerm) Res.UseResFile(resNum)

1 0

python/dist/src/Doc/tut tut.tex,1.255,1.256
by rhettinger＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20946 Modified Files: tut.tex Log Message: SF 1053956: help() not in tutorial index Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.255 retrieving revision 1.256 diff -u -d -r1.255 -r1.256 --- tut.tex 25 Oct 2004 16:03:49 -0000 1.255 +++ tut.tex 26 Oct 2004 03:53:35 -0000 1.256 @@ -4479,6 +4479,7 @@ shadowing the builtin \function{open()} function which operates much differently. +\bifuncindex{help} The builtin \function{dir()} and \function{help()} functions are useful as interactive aids for working with large modules like \module{os}:

1 0

python/dist/src/Objects stringobject.c, 2.225, 2.226
by rhettinger＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26552/Objects Modified Files: stringobject.c Log Message: SF bug #1054139: serious string hashing error in 2.4b1 _PyString_Resize() readied strings for mutation but did not invalidate the cached hash value. Index: stringobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v retrieving revision 2.225 retrieving revision 2.226 diff -u -d -r2.225 -r2.226 --- stringobject.c 23 Aug 2004 23:23:54 -0000 2.225 +++ stringobject.c 26 Oct 2004 01:52:37 -0000 2.226 @@ -3530,6 +3530,7 @@ sv = (PyStringObject *) *pv; sv->ob_size = newsize; sv->ob_sval[newsize] = '\0'; + sv->ob_shash = -1; /* invalidate cached hash value */ return 0; }

1 0

python/dist/src/Misc NEWS,1.1175,1.1176
by rhettinger＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26552/Misc Modified Files: NEWS Log Message: SF bug #1054139: serious string hashing error in 2.4b1 _PyString_Resize() readied strings for mutation but did not invalidate the cached hash value. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1175 retrieving revision 1.1176 diff -u -d -r1.1175 -r1.1176 --- NEWS 24 Oct 2004 00:32:24 -0000 1.1175 +++ NEWS 26 Oct 2004 01:52:36 -0000 1.1176 @@ -32,7 +32,7 @@ Core and builtins ----------------- -... +- Bug #1054139 _PyString_Resize() now invalidates its cached hash value. Extension Modules -----------------

1 0

python/dist/src/Lib/test string_tests.py, 1.41, 1.42
by rhettinger＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26552/Lib/test Modified Files: string_tests.py Log Message: SF bug #1054139: serious string hashing error in 2.4b1 _PyString_Resize() readied strings for mutation but did not invalidate the cached hash value. Index: string_tests.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- string_tests.py 27 Aug 2004 05:36:07 -0000 1.41 +++ string_tests.py 26 Oct 2004 01:52:36 -0000 1.42 @@ -80,6 +80,15 @@ args = self.fixtype(args) getattr(object, methodname)(*args) + def test_hash(self): + # SF bug 1054139: += optimization was not invalidating cached hash value + a = self.type2test('DNSSEC') + b = self.type2test('') + for c in a: + b += c + hash(b) + self.assertEqual(hash(a), hash(b)) + def test_capitalize(self): self.checkequal(' hello ', ' hello ', 'capitalize') self.checkequal('Hello ', 'Hello ','capitalize')

1 0

python/dist/src/Doc/lib xmlsaxhandler.tex, 1.10.12.1, 1.10.12.2
by fdrake＠users.sourceforge.net 25 Oct '04

25 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2279 Modified Files: Tag: release23-maint xmlsaxhandler.tex Log Message: add missing line break Index: xmlsaxhandler.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/xmlsaxhandler.tex,v retrieving revision 1.10.12.1 retrieving revision 1.10.12.2 diff -u -d -r1.10.12.1 -r1.10.12.2 --- xmlsaxhandler.tex 6 May 2004 03:48:32 -0000 1.10.12.1 +++ xmlsaxhandler.tex 25 Oct 2004 21:41:57 -0000 1.10.12.2 @@ -65,7 +65,7 @@ \end{datadesc} \begin{datadesc}{feature_string_interning} - Value: \code{"http://xml.org/sax/features/string-interning"} + Value: \code{"http://xml.org/sax/features/string-interning"}\\ true: All element names, prefixes, attribute names, Namespace URIs, and local names are interned using the built-in intern function.\\ false: Names are not necessarily interned, although they may be (default).\\

1 0