Mailman 3 March 2004 - Python-checkins

python/dist/src/Lib platform.py,1.11,1.12
by lemburg＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32651 Modified Files: platform.py Log Message: Added more Windows version names (thanks to Thomas Heller). Fixed bug in platform() cache (thanks to Brett Cannon). (Restored Python 1.5.2 compatibility.) Index: platform.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** platform.py 25 Mar 2004 18:32:11 -0000 1.11 --- platform.py 25 Mar 2004 18:35:12 -0000 1.12 *************** *** 32,36 **** # # History: ! # 1.0.2 - fix a bug with caching of value for platform() # 1.0.1 - reformatted to make doc.py happy # 1.0.0 - reformatted a bit and checked into Python CVS --- 32,36 ---- # # History: ! # 1.0.2 - added more Windows support # 1.0.1 - reformatted to make doc.py happy # 1.0.0 - reformatted a bit and checked into Python CVS *************** *** 458,462 **** --- 458,466 ---- # XXX Is there any way to find out the processor type on WinXX ? # XXX Is win32 available on Windows CE ? + # # Adapted from code posted by Karl Putland to comp.lang.python. + # + # The mappings between reg. values and release names can be found + # here: http://msdn.microsoft.com/library/en-us/sysinfo/base/osversioninfo_str.asp # Import the needed APIs *************** *** 480,485 **** if min == 0: release = '95' ! else: release = '98' elif maj == 5: release = '2000' --- 484,493 ---- if min == 0: release = '95' ! elif min == 10: release = '98' + elif min == 90: + release = 'Me' + else: + release = 'postMe' elif maj == 5: release = '2000' *************** *** 489,493 **** release = 'NT' elif maj == 5: ! release = '2000' else: if not release: --- 497,508 ---- release = 'NT' elif maj == 5: ! if min == 0: ! release = '2000' ! elif min == 1: ! release = 'XP' ! elif min == 2: ! release = '2003Server' ! else: ! release = 'post2003' else: if not release: *************** *** 1137,1144 **** ### The Opus Magnum of platform strings :-) ! _platform_cache_terse = None ! _platform_cache_not_terse = None ! _platform_aliased_cache_terse = None ! _platform_aliased_cache_not_terse = None def platform(aliased=0, terse=0): --- 1152,1156 ---- ### The Opus Magnum of platform strings :-) ! _platform_cache = {} def platform(aliased=0, terse=0): *************** *** 1161,1175 **** """ ! global _platform_cache_terse, _platform_cache_not_terse ! global _platform_aliased_cache_terse, _platform_aliased_cache_not_terse ! ! if not aliased and terse and (_platform_cache_terse is not None): ! return _platform_cache_terse ! elif not aliased and not terse and (_platform_cache_not_terse is not None): ! return _platform_cache_not_terse ! elif terse and _platform_aliased_cache_terse is not None: ! return _platform_aliased_cache_terse ! elif not terse and _platform_aliased_cache_not_terse is not None: ! return _platform_aliased_cache_not_terse # Get uname information and then apply platform specific cosmetics --- 1173,1179 ---- """ ! result = _platform_cache.get((aliased, terse), None) ! if result is not None: ! return result # Get uname information and then apply platform specific cosmetics *************** *** 1227,1241 **** platform = _platform(system,release,machine,processor,bits,linkage) ! if aliased and terse: ! _platform_aliased_cache_terse = platform ! elif aliased and not terse: ! _platform_aliased_cache_not_terse = platform ! elif terse: ! pass ! else: ! if terse: ! _platform_cache_terse = platform ! else: ! _platform_cache_not_terse = platform return platform --- 1231,1235 ---- platform = _platform(system,release,machine,processor,bits,linkage) ! _platform_cache[(aliased, terse)] = platform return platform

1 0

python/dist/src/Lib platform.py,1.10,1.11
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31797/Lib Modified Files: platform.py Log Message: Fix last patch to be backwards-compatible with Python 1.5.2 . Bumped version micro number. Index: platform.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** platform.py 25 Mar 2004 16:55:11 -0000 1.10 --- platform.py 25 Mar 2004 18:32:11 -0000 1.11 *************** *** 32,35 **** --- 32,36 ---- # # History: + # 1.0.2 - fix a bug with caching of value for platform() # 1.0.1 - reformatted to make doc.py happy # 1.0.0 - reformatted a bit and checked into Python CVS *************** *** 103,107 **** """ ! __version__ = '1.0.1' import sys,string,os,re --- 104,108 ---- """ ! __version__ = '1.0.2' import sys,string,os,re *************** *** 1136,1141 **** ### The Opus Magnum of platform strings :-) ! _platform_cache = {True:None, False:None} ! _platform_aliased_cache = {True:None, False:None} def platform(aliased=0, terse=0): --- 1137,1144 ---- ### The Opus Magnum of platform strings :-) ! _platform_cache_terse = None ! _platform_cache_not_terse = None ! _platform_aliased_cache_terse = None ! _platform_aliased_cache_not_terse = None def platform(aliased=0, terse=0): *************** *** 1158,1167 **** """ ! global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache[bool(terse)] is not None): ! return _platform_cache[bool(terse)] ! elif _platform_aliased_cache[bool(terse)] is not None: ! return _platform_aliased_cache[bool(terse)] # Get uname information and then apply platform specific cosmetics --- 1161,1175 ---- """ ! global _platform_cache_terse, _platform_cache_not_terse ! global _platform_aliased_cache_terse, _platform_aliased_cache_not_terse ! if not aliased and terse and (_platform_cache_terse is not None): ! return _platform_cache_terse ! elif not aliased and not terse and (_platform_cache_not_terse is not None): ! return _platform_cache_not_terse ! elif terse and _platform_aliased_cache_terse is not None: ! return _platform_aliased_cache_terse ! elif not terse and _platform_aliased_cache_not_terse is not None: ! return _platform_aliased_cache_not_terse # Get uname information and then apply platform specific cosmetics *************** *** 1219,1228 **** platform = _platform(system,release,machine,processor,bits,linkage) ! if aliased: ! _platform_aliased_cache[bool(terse)] = platform elif terse: pass else: ! _platform_cache[bool(terse)] = platform return platform --- 1227,1241 ---- platform = _platform(system,release,machine,processor,bits,linkage) ! if aliased and terse: ! _platform_aliased_cache_terse = platform ! elif aliased and not terse: ! _platform_aliased_cache_not_terse = platform elif terse: pass else: ! if terse: ! _platform_cache_terse = platform ! else: ! _platform_cache_not_terse = platform return platform

1 0

python/dist/src/Lib platform.py,1.5.8.1,1.5.8.2
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11663/Lib Modified Files: Tag: release23-maint platform.py Log Message: Fixed a caching bug in platform.platform() where the argument of 'terse' was not taken into consideration when caching value. Index: platform.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v retrieving revision 1.5.8.1 retrieving revision 1.5.8.2 diff -C2 -d -r1.5.8.1 -r1.5.8.2 *** platform.py 14 Oct 2003 22:32:34 -0000 1.5.8.1 --- platform.py 25 Mar 2004 16:56:14 -0000 1.5.8.2 *************** *** 1137,1142 **** ### The Opus Magnum of platform strings :-) ! _platform_cache = None ! _platform_aliased_cache = None def platform(aliased=0, terse=0): --- 1137,1142 ---- ### The Opus Magnum of platform strings :-) ! _platform_cache = {True:None, False:None} ! _platform_aliased_cache = {True:None, False:None} def platform(aliased=0, terse=0): *************** *** 1161,1168 **** global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache is not None): ! return _platform_cache ! elif _platform_aliased_cache is not None: ! return _platform_aliased_cache # Get uname information and then apply platform specific cosmetics --- 1161,1168 ---- global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache[bool(terse)] is not None): ! return _platform_cache[bool(terse)] ! elif _platform_aliased_cache[bool(terse)] is not None: ! return _platform_aliased_cache[bool(terse)] # Get uname information and then apply platform specific cosmetics *************** *** 1221,1229 **** if aliased: ! _platform_aliased_cache = platform elif terse: pass else: ! _platform_cache = platform return platform --- 1221,1229 ---- if aliased: ! _platform_aliased_cache[bool(terse)] = platform elif terse: pass else: ! _platform_cache[bool(terse)] = platform return platform

1 0

python/dist/src/Misc NEWS,1.831.4.96,1.831.4.97
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11663/Misc Modified Files: Tag: release23-maint NEWS Log Message: Fixed a caching bug in platform.platform() where the argument of 'terse' was not taken into consideration when caching value. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.96 retrieving revision 1.831.4.97 diff -C2 -d -r1.831.4.96 -r1.831.4.97 *** NEWS 21 Mar 2004 19:53:59 -0000 1.831.4.96 --- NEWS 25 Mar 2004 16:56:14 -0000 1.831.4.97 *************** *** 39,42 **** --- 39,45 ---- ------- + - Fixed a caching bug in platform.platform() where the argument of 'terse' was + not taken into consideration when caching value. + - Bug #920575: A problem that _locale module segfaults on nl_langinfo(ERA) caused by GNU libc's illegal NULL return is fixed.

1 0

python/dist/src/Lib platform.py,1.9,1.10
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11409/Lib Modified Files: platform.py Log Message: Fixed a caching bug in platform.platform() where the argument of 'terse' was not taken into consideration when caching value. Index: platform.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/platform.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** platform.py 6 Nov 2003 14:06:47 -0000 1.9 --- platform.py 25 Mar 2004 16:55:11 -0000 1.10 *************** *** 1136,1141 **** ### The Opus Magnum of platform strings :-) ! _platform_cache = None ! _platform_aliased_cache = None def platform(aliased=0, terse=0): --- 1136,1141 ---- ### The Opus Magnum of platform strings :-) ! _platform_cache = {True:None, False:None} ! _platform_aliased_cache = {True:None, False:None} def platform(aliased=0, terse=0): *************** *** 1160,1167 **** global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache is not None): ! return _platform_cache ! elif _platform_aliased_cache is not None: ! return _platform_aliased_cache # Get uname information and then apply platform specific cosmetics --- 1160,1167 ---- global _platform_cache,_platform_aliased_cache ! if not aliased and (_platform_cache[bool(terse)] is not None): ! return _platform_cache[bool(terse)] ! elif _platform_aliased_cache[bool(terse)] is not None: ! return _platform_aliased_cache[bool(terse)] # Get uname information and then apply platform specific cosmetics *************** *** 1220,1228 **** if aliased: ! _platform_aliased_cache = platform elif terse: pass else: ! _platform_cache = platform return platform --- 1220,1228 ---- if aliased: ! _platform_aliased_cache[bool(terse)] = platform elif terse: pass else: ! _platform_cache[bool(terse)] = platform return platform

1 0

python/dist/src/Misc NEWS,1.961,1.962
by bcannon＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11409/Misc Modified Files: NEWS Log Message: Fixed a caching bug in platform.platform() where the argument of 'terse' was not taken into consideration when caching value. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.961 retrieving revision 1.962 diff -C2 -d -r1.961 -r1.962 *** NEWS 24 Mar 2004 21:57:09 -0000 1.961 --- NEWS 25 Mar 2004 16:55:12 -0000 1.962 *************** *** 284,288 **** It offers some of functionality of SQL's groupby keyword and of the Unix uniq filter. ! - itertools now has a new function, tee() which produces two independent iterators from a single iterable. --- 284,288 ---- It offers some of functionality of SQL's groupby keyword and of the Unix uniq filter. ! - itertools now has a new function, tee() which produces two independent iterators from a single iterable. *************** *** 297,300 **** --- 297,303 ---- ------- + - Fixed a caching bug in platform.platform() where the argument of 'terse' was + not taken into consideration when caching value. + - Added two new command-line arguments for profile (output file and default sort).

1 0

python/dist/src/Doc/lib liburllib.tex,1.51,1.52
by fdrake＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10007 Modified Files: liburllib.tex Log Message: Note that reading from a socket may not always return all of the remaining content of a stream when expected to do so. Closes SF bug #725265. Should be backported to Python 2.3.x. Index: liburllib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liburllib.tex,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** liburllib.tex 27 Aug 2003 15:11:40 -0000 1.51 --- liburllib.tex 25 Mar 2004 16:51:12 -0000 1.52 *************** *** 30,33 **** --- 30,37 ---- \method{close()}, \method{info()} and \method{geturl()}. It also has proper support for the iterator protocol. + One caveat: the \method{read()} method, if the size argument is + omitted or negative, may not read until the end of the data stream; + there is no good way to determine that the entire stream from a socket + has been read in the general case. Except for the \method{info()} and \method{geturl()} methods,

1 0

python/dist/src/Doc/lib xmldomminidom.tex, 1.8, 1.9
by fdrake＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7603 Modified Files: xmldomminidom.tex Log Message: - make sure the methods minidom adds to the basic DOM are attributed to Node objects in the index (closes SF bug #832251) - fix a variety of markup nits Someone should backport this patch to Python 2.3.x. Index: xmldomminidom.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/xmldomminidom.tex,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xmldomminidom.tex 18 Apr 2003 22:04:34 -0000 1.8 --- xmldomminidom.tex 25 Mar 2004 16:39:46 -0000 1.9 *************** *** 128,132 **** ! \begin{methoddesc}{unlink}{} Break internal references within the DOM so that it will be garbage collected on versions of Python without cyclic GC. Even when cyclic --- 128,132 ---- ! \begin{methoddesc}[Node]{unlink}{} Break internal references within the DOM so that it will be garbage collected on versions of Python without cyclic GC. Even when cyclic *************** *** 138,160 **** \end{methoddesc} ! \begin{methoddesc}{writexml}{writer} Write XML to the writer object. The writer should have a \method{write()} method which matches that of the file object interface. ! \versionadded[To support pretty output, new keyword parameters indent, ! addindent, and newl have been added]{2.1} ! \versionadded[For the \class{Document} node, an additional keyword argument encoding can be used to specify the encoding field of the XML header]{2.3} - \end{methoddesc} ! \begin{methoddesc}{toxml}{\optional{encoding}} Return the XML that the DOM represents as a string. - \versionadded[the \var{encoding} argument]{2.3} - With no argument, the XML header does not specify an encoding, and the result is Unicode string if the default encoding cannot represent all --- 138,157 ---- \end{methoddesc} ! \begin{methoddesc}[Node]{writexml}{writer} Write XML to the writer object. The writer should have a \method{write()} method which matches that of the file object interface. ! \versionchanged[To support pretty output, new keyword parameters ! \var{indent}, \var{addindent}, and \var{newl} have been added]{2.1} ! \versionchanged[For the \class{Document} node, an additional keyword argument encoding can be used to specify the encoding field of the XML header]{2.3} \end{methoddesc} ! \begin{methoddesc}[Node]{toxml}{\optional{encoding}} Return the XML that the DOM represents as a string. With no argument, the XML header does not specify an encoding, and the result is Unicode string if the default encoding cannot represent all *************** *** 169,176 **** as "utf-8". \end{methoddesc} ! \begin{methoddesc}{toprettyxml}{\optional{indent\optional{, newl}}} ! Return a pretty-printed version of the document. \var{indent} specifies the indentation string and defaults to a tabulator; \var{newl} specifies --- 166,173 ---- as "utf-8". + \versionchanged[the \var{encoding} argument was introduced]{2.3} \end{methoddesc} ! \begin{methoddesc}[Node]{toprettyxml}{\optional{indent\optional{, newl}}} Return a pretty-printed version of the document. \var{indent} specifies the indentation string and defaults to a tabulator; \var{newl} specifies *************** *** 178,184 **** \versionadded{2.1} ! ! \versionadded[the encoding argument; see \method{toxml}]{2.3} ! \end{methoddesc} --- 175,179 ---- \versionadded{2.1} ! \versionchanged[the encoding argument; see \method{toxml()}]{2.3} \end{methoddesc} *************** *** 186,190 **** \refmodule{xml.dom.minidom}: ! \begin{methoddesc}{cloneNode}{deep} Although this method was present in the version of \refmodule{xml.dom.minidom} packaged with Python 2.0, it was seriously --- 181,185 ---- \refmodule{xml.dom.minidom}: ! \begin{methoddesc}[Node]{cloneNode}{deep} Although this method was present in the version of \refmodule{xml.dom.minidom} packaged with Python 2.0, it was seriously

1 0

python/dist/src/Doc/dist dist.tex,1.70,1.71
by fdrake＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Doc/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5902 Modified Files: dist.tex Log Message: remove duplicate use of the meta-data label Index: dist.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/dist/dist.tex,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** dist.tex 23 Mar 2004 19:02:38 -0000 1.70 --- dist.tex 25 Mar 2004 16:33:29 -0000 1.71 *************** *** 799,803 **** \subsection{Debugging the setup script} - \label{meta-data} Sometimes things go wrong, and the setup script doesn't do what the --- 799,802 ----

1 0

python/dist/src/Objects bufferobject.c,2.23,2.24
by loewis＠users.sourceforge.net March 25, 2004

March 25, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2734/Objects Modified Files: bufferobject.c Log Message: Correct code to advance ptr to be well-formed C. Index: bufferobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v retrieving revision 2.23 retrieving revision 2.24 diff -C2 -d -r2.23 -r2.24 *** bufferobject.c 11 Mar 2004 02:42:45 -0000 2.23 --- bufferobject.c 25 Mar 2004 16:16:28 -0000 2.24 *************** *** 44,48 **** else offset = self->b_offset; ! (char *)*ptr = (char *)*ptr + offset; if (self->b_size == Py_END_OF_BUFFER) *size = count; --- 44,48 ---- else offset = self->b_offset; ! *(char **)ptr = *(char **)ptr + offset; if (self->b_size == Py_END_OF_BUFFER) *size = count;

1 0