Mailman 3 October 2003 - Python-checkins

python/nondist/peps pep-0101.txt,1.44,1.45
by fdrake＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv22860 Modified Files: pep-0101.txt Log Message: remove duplicate description of the final changes made in the documentation release, and add a note that they're described in a separate step (down near "send the release announcement") Index: pep-0101.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** pep-0101.txt 3 Oct 2003 08:35:10 -0000 1.44 --- pep-0101.txt 3 Oct 2003 14:06:10 -0000 1.45 *************** *** 306,310 **** these can happen any time after what's already happened in this process, and the last two should happen as soon as the release ! announcement has been made. At this time, edit the versions.ht file in doc/ to make add the --- 306,311 ---- these can happen any time after what's already happened in this process, and the last two should happen as soon as the release ! announcement has been made. Those are described in a separate ! step of this checklist. At this time, edit the versions.ht file in doc/ to make add the *************** *** 317,326 **** releases. (Is should be fairly easy to figure this out while looking at the file.) - - Edit index.ht in doc/ to refer to the new version. - - Log onto creosote and move the symlink 'current' in the - /usr/local/www/www.python.org/doc directory to point to the - new version's documentation. ___ Thomas grabs the HTML to build the Windows helpfile. --- 318,321 ----

1 0

python/dist/src/Lib string.py,1.68,1.69
by montanaro＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv22704/Lib Modified Files: string.py Log Message: tweak the docstring to not be so focused on 1.6. Index: string.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** string.py 10 Apr 2003 22:35:31 -0000 1.68 --- string.py 3 Oct 2003 14:05:26 -0000 1.69 *************** *** 1,8 **** ! """A collection of string operations (most are no longer used in Python 1.6). ! Warning: most of the code you see here isn't normally used nowadays. With ! Python 1.6, many of these functions are implemented as methods on the ! standard string object. They used to be implemented by a built-in module ! called strop, but strop is now obsolete itself. Public module variables: --- 1,8 ---- ! """A collection of string operations (most are no longer used). ! Warning: most of the code you see here isn't normally used nowadays. ! Beginning with Python 1.6, many of these functions are implemented as ! methods on the standard string object. They used to be implemented by ! a built-in module called strop, but strop is now obsolete itself. Public module variables:

1 0

python/dist/src/Lib/test test_csv.py,1.10,1.11
by montanaro＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv20930/Lib/test Modified Files: test_csv.py Log Message: Make the fieldnames argument optional in the DictReader. If self.fieldnames is None, the next row read is used as the fieldnames. In the common case, this means the programmer doesn't need to know the fieldnames ahead of time. The first row of the file will be used. In the uncommon case, this means the programmer can set the reader's fieldnames attribute to None at any time and have the next row read as the next set of fieldnames, so a csv file can contain several "sections", each with different fieldnames. Index: test_csv.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_csv.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** test_csv.py 6 Sep 2003 19:52:12 -0000 1.10 --- test_csv.py 3 Oct 2003 14:03:01 -0000 1.11 *************** *** 383,387 **** self.readerAssertEqual('"abc\\,def"\r\n', [['abc,def']]) - # Disabled, pending support in csv.utils module class TestDictFields(unittest.TestCase): ### "long" means the row is longer than the number of fieldnames --- 383,386 ---- *************** *** 402,405 **** --- 401,408 ---- self.assertEqual(reader.next(), {"f1": '1', "f2": '2', "f3": 'abc'}) + def test_read_dict_no_fieldnames(self): + reader = csv.DictReader(StringIO("f1,f2,f3\r\n1,2,abc\r\n")) + self.assertEqual(reader.next(), {"f1": '1', "f2": '2', "f3": 'abc'}) + def test_read_long(self): reader = csv.DictReader(StringIO("1,2,abc,4,5,6\r\n"), *************** *** 411,414 **** --- 414,423 ---- reader = csv.DictReader(StringIO("1,2,abc,4,5,6\r\n"), fieldnames=["f1", "f2"], restkey="_rest") + self.assertEqual(reader.next(), {"f1": '1', "f2": '2', + "_rest": ["abc", "4", "5", "6"]}) + + def test_read_long_with_rest_no_fieldnames(self): + reader = csv.DictReader(StringIO("f1,f2\r\n1,2,abc,4,5,6\r\n"), + restkey="_rest") self.assertEqual(reader.next(), {"f1": '1', "f2": '2', "_rest": ["abc", "4", "5", "6"]})

1 0

python/dist/src/Lib csv.py,1.9,1.10
by montanaro＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv20930/Lib Modified Files: csv.py Log Message: Make the fieldnames argument optional in the DictReader. If self.fieldnames is None, the next row read is used as the fieldnames. In the common case, this means the programmer doesn't need to know the fieldnames ahead of time. The first row of the file will be used. In the uncommon case, this means the programmer can set the reader's fieldnames attribute to None at any time and have the next row read as the next set of fieldnames, so a csv file can contain several "sections", each with different fieldnames. Index: csv.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/csv.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** csv.py 6 Sep 2003 19:52:12 -0000 1.9 --- csv.py 3 Oct 2003 14:03:01 -0000 1.10 *************** *** 93,97 **** class DictReader: ! def __init__(self, f, fieldnames, restkey=None, restval=None, dialect="excel", *args, **kwds): self.fieldnames = fieldnames # list of keys for the dict --- 93,97 ---- class DictReader: ! def __init__(self, f, fieldnames=None, restkey=None, restval=None, dialect="excel", *args, **kwds): self.fieldnames = fieldnames # list of keys for the dict *************** *** 105,108 **** --- 105,112 ---- def next(self): row = self.reader.next() + if self.fieldnames is None: + self.fieldnames = row + row = self.reader.next() + # unlike the basic reader, we prefer not to return blanks, # because we will typically wind up with a dict full of None

1 0

python/dist/src/Doc/lib libcsv.tex,1.9,1.10
by montanaro＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv20930/Doc/lib Modified Files: libcsv.tex Log Message: Make the fieldnames argument optional in the DictReader. If self.fieldnames is None, the next row read is used as the fieldnames. In the common case, this means the programmer doesn't need to know the fieldnames ahead of time. The first row of the file will be used. In the uncommon case, this means the programmer can set the reader's fieldnames attribute to None at any time and have the next row read as the next set of fieldnames, so a csv file can contain several "sections", each with different fieldnames. Index: libcsv.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcsv.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** libcsv.tex 10 Sep 2003 18:54:49 -0000 1.9 --- libcsv.tex 3 Oct 2003 14:03:01 -0000 1.10 *************** *** 118,129 **** The \module{csv} module defines the following classes: ! \begin{classdesc}{DictReader}{csvfile, fieldnames\optional{, restkey=\constant{None}\optional{, restval=\constant{None}\optional{, dialect=\code{'excel'}\optional{, ! fmtparam}}}}} Create an object which operates like a regular reader but maps the ! information read into a dict whose keys are given by the \var{fieldnames} ! parameter. If the row read has fewer fields than the fieldnames sequence, the value of \var{restval} will be used as the default value. If the row read has more fields than the fieldnames sequence, the remaining data is --- 118,133 ---- The \module{csv} module defines the following classes: ! \begin{classdesc}{DictReader}{csvfile\optional{, ! fieldnames=\constant{None},\optional{, restkey=\constant{None}\optional{, restval=\constant{None}\optional{, dialect=\code{'excel'}\optional{, ! fmtparam}}}}}} Create an object which operates like a regular reader but maps the ! information read into a dict whose keys are given by the optional ! {} \var{fieldnames} ! parameter. If the \var{fieldnames} parameter is omitted, the values in ! the first row of the \var{csvfile} will be used as the fieldnames. ! If the row read has fewer fields than the fieldnames sequence, the value of \var{restval} will be used as the default value. If the row read has more fields than the fieldnames sequence, the remaining data is *************** *** 150,153 **** --- 154,164 ---- \code{'ignore'}, extra values in the dictionary are ignored. All other parameters are interpreted as for \class{writer} objects. + + Note that unlike the \class{DictReader} class, the \var{fieldnames} + parameter of the \class{DictWriter} is not optional. Since Python's + \class{dict} objects are not ordered, there is not enough information + available to deduce the order in which the row should be written to the + \var{csvfile}. + \end{classdesc}

1 0

python/dist/src/Misc NEWS,1.861,1.862
by loewis＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv20830/Misc Modified Files: NEWS Log Message: Patch #813445: Add IPPROTO_IPV6 option to the socketmodule. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.861 retrieving revision 1.862 diff -C2 -d -r1.861 -r1.862 *** NEWS 23 Sep 2003 20:21:00 -0000 1.861 --- NEWS 3 Oct 2003 13:57:37 -0000 1.862 *************** *** 34,37 **** --- 34,39 ---- ----------------- + - socket.IPPROTO_IPV6 was added. + - readline.clear_history was added.

1 0

python/dist/src/Modules socketmodule.c, 1.273, 1.274
by loewis＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv20466/Modules Modified Files: socketmodule.c Log Message: Patch #813445: Add missing socket.IPPROTO_IPV6. Backported to 2.3. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.273 retrieving revision 1.274 diff -C2 -d -r1.273 -r1.274 *** socketmodule.c 7 Aug 2003 11:55:15 -0000 1.273 --- socketmodule.c 3 Oct 2003 13:56:20 -0000 1.274 *************** *** 3750,3753 **** --- 3750,3756 ---- PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4); #endif + #ifdef IPPROTO_IPV6 + PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6); + #endif #ifdef IPPROTO_IPIP PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);

1 0

python/dist/src/Misc NEWS,1.831.4.57,1.831.4.58
by loewis＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv20322/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #813445: Add missing socket.IPPROTO_IPV6. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.57 retrieving revision 1.831.4.58 diff -C2 -d -r1.831.4.57 -r1.831.4.58 *** NEWS 2 Oct 2003 12:50:18 -0000 1.831.4.57 --- NEWS 3 Oct 2003 13:55:37 -0000 1.831.4.58 *************** *** 5,8 **** --- 5,18 ---- (editors: check NEWS.help for information about editing NEWS using ReST.) + What's New in Python 2.3.3c1? + =================================== + + *Release date: XXX * + + Extension modules + ----------------- + + - Patch #813445: Add missing socket.IPPROTO_IPV6. + What's New in Python 2.3.2 (final)? ===================================

1 0

[Python-checkins] python/dist/src/Modules socketmodule.c, 1.271.6.2, 1.271.6.3
by loewis＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv20322/Modules Modified Files: Tag: release23-maint socketmodule.c Log Message: Patch #813445: Add missing socket.IPPROTO_IPV6. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.271.6.2 retrieving revision 1.271.6.3 diff -C2 -d -r1.271.6.2 -r1.271.6.3 *** socketmodule.c 7 Aug 2003 11:56:22 -0000 1.271.6.2 --- socketmodule.c 3 Oct 2003 13:55:37 -0000 1.271.6.3 *************** *** 3750,3753 **** --- 3750,3756 ---- PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4); #endif + #ifdef IPPROTO_IPV6 + PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6); + #endif #ifdef IPPROTO_IPIP PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);

1 0

python/dist/src configure, 1.416.4.7, 1.416.4.8 configure.in, 1.427.4.6, 1.427.4.7
by loewis＠users.sourceforge.net 03 Oct '03

03 Oct '03

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv18291 Modified Files: Tag: release23-maint configure configure.in Log Message: Patch #814764: Undefine xopen_source on OpenBSD 3.4. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.416.4.7 retrieving revision 1.416.4.8 diff -C2 -d -r1.416.4.7 -r1.416.4.8 *** configure 27 Sep 2003 08:58:55 -0000 1.416.4.7 --- configure 3 Oct 2003 13:48:26 -0000 1.416.4.8 *************** *** 1438,1443 **** # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # even though select is a POSIX function. Reported by J. Ribbens. ! # Reconfirmed for OpenBSD 3.3 by Zachary Hamm. ! OpenBSD/2.* | OpenBSD/3.[0123]) define_xopen_source=no;; # On Solaris 2.6, sys/wait.h is inconsistent in the usage --- 1438,1443 ---- # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # even though select is a POSIX function. Reported by J. Ribbens. ! # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. ! OpenBSD/2.* | OpenBSD/3.[01234]) define_xopen_source=no;; # On Solaris 2.6, sys/wait.h is inconsistent in the usage Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.427.4.6 retrieving revision 1.427.4.7 diff -C2 -d -r1.427.4.6 -r1.427.4.7 *** configure.in 25 Sep 2003 15:21:00 -0000 1.427.4.6 --- configure.in 3 Oct 2003 13:48:28 -0000 1.427.4.7 *************** *** 136,141 **** # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # even though select is a POSIX function. Reported by J. Ribbens. ! # Reconfirmed for OpenBSD 3.3 by Zachary Hamm. ! OpenBSD/2.* | OpenBSD/3.@<:@0123@:>@) define_xopen_source=no;; # On Solaris 2.6, sys/wait.h is inconsistent in the usage --- 136,141 ---- # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # even though select is a POSIX function. Reported by J. Ribbens. ! # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. ! OpenBSD/2.* | OpenBSD/3.@<:@01234@:>@) define_xopen_source=no;; # On Solaris 2.6, sys/wait.h is inconsistent in the usage

1 0