Mailman 3 August 2005 - Python-checkins

python/dist/src/Doc/ref ref3.tex,1.126,1.127
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19458/Doc/ref Modified Files: ref3.tex Log Message: bug [ 1261229 ] __new__ is class method Index: ref3.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref3.tex,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- ref3.tex 21 Aug 2005 11:26:14 -0000 1.126 +++ ref3.tex 25 Aug 2005 21:56:45 -0000 1.127 @@ -1056,7 +1056,7 @@ \begin{methoddesc}[object]{__new__}{cls\optional{, \moreargs}} Called to create a new instance of class \var{cls}. \method{__new__()} -is a static method (special-cased so you need not declare it as such) +is a class method (special-cased so you need not declare it as such) that takes the class of which an instance was requested as its first argument. The remaining arguments are those passed to the object constructor expression (the call to the class). The return value of

1 0

python/dist/src/Demo/parser README,1.4,1.5
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Demo/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1148/Demo/parser Modified Files: README Log Message: Minor spelling nit. Index: README =================================================================== RCS file: /cvsroot/python/python/dist/src/Demo/parser/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 23 Oct 2000 20:50:23 -0000 1.4 +++ README 25 Aug 2005 20:41:38 -0000 1.5 @@ -20,6 +20,6 @@ handle nested constructs easily using the functions and classes in example.py. - test_parser.py program to put the parser module through it's paces. + test_parser.py program to put the parser module through its paces. Enjoy!

1 0

python/dist/src/Modules bz2module.c, 1.23.2.1, 1.23.2.2
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5002/Modules Modified Files: Tag: release24-maint bz2module.c Log Message: Backport fixes for bugs #1191043 and #1215928. Index: bz2module.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/bz2module.c,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -u -d -r1.23.2.1 -r1.23.2.2 --- bz2module.c 3 Jun 2005 19:45:52 -0000 1.23.2.1 +++ bz2module.c 25 Aug 2005 13:10:58 -0000 1.23.2.2 @@ -22,6 +22,18 @@ Gustavo Niemeyer <niemeyer(a)conectiva.com>\n\ "; +/* Our very own off_t-like type, 64-bit if possible */ +/* copied from Objects/fileobject.c */ +#if !defined(HAVE_LARGEFILE_SUPPORT) +typedef off_t Py_off_t; +#elif SIZEOF_OFF_T >= 8 +typedef off_t Py_off_t; +#elif SIZEOF_FPOS_T >= 8 +typedef fpos_t Py_off_t; +#else +#error "Large file support, but neither off_t nor fpos_t is large enough." +#endif + #define BUF(v) PyString_AS_STRING((PyStringObject *)v) #define MODE_CLOSED 0 @@ -405,7 +417,9 @@ Util_DropReadAhead(f); } if (f->mode == MODE_READ_EOF) { - return -1; + f->f_bufptr = f->f_buf; + f->f_bufend = f->f_buf; + return 0; } if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) { return -1; @@ -682,13 +696,13 @@ } totalread += nread; p = memchr(buffer+nfilled, '\n', nread); - if (p == NULL) { + if (!shortread && p == NULL) { /* Need a larger buffer to fit this line */ nfilled += nread; buffersize *= 2; if (buffersize > INT_MAX) { PyErr_SetString(PyExc_OverflowError, - "line is longer than a Python string can hold"); + "line is longer than a Python string can hold"); goto error; } if (big_buffer == NULL) { @@ -709,7 +723,7 @@ } end = buffer+nfilled+nread; q = buffer; - do { + while (p != NULL) { /* Process complete lines */ p++; line = PyString_FromStringAndSize(q, p-q); @@ -721,7 +735,7 @@ goto error; q = p; p = memchr(q, '\n', end-q); - } while (p != NULL); + } /* Move the remaining incomplete line to the start */ nfilled = end-q; memmove(buffer, q, nfilled); @@ -962,7 +976,8 @@ BZ2File_seek(BZ2FileObject *self, PyObject *args) { int where = 0; - long offset; + PyObject *offobj; + Py_off_t offset; char small_buffer[SMALLCHUNK]; char *buffer = small_buffer; size_t buffersize = SMALLCHUNK; @@ -973,7 +988,15 @@ int rewind = 0; PyObject *ret = NULL; - if (!PyArg_ParseTuple(args, "l|i:seek", &offset, &where)) + if (!PyArg_ParseTuple(args, "O|i:seek", &offobj, &where)) + return NULL; +#if !defined(HAVE_LARGEFILE_SUPPORT) + offset = PyInt_AsLong(offobj); +#else + offset = PyLong_Check(offobj) ? + PyLong_AsLongLong(offobj) : PyInt_AsLong(offobj); +#endif + if (PyErr_Occurred()) return NULL; ACQUIRE_LOCK(self);

1 0

python/dist/src/Misc NEWS, 1.1193.2.85, 1.1193.2.86
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5002/Misc Modified Files: Tag: release24-maint NEWS Log Message: Backport fixes for bugs #1191043 and #1215928. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.85 retrieving revision 1.1193.2.86 diff -u -d -r1.1193.2.85 -r1.1193.2.86 --- NEWS 25 Aug 2005 11:04:04 -0000 1.1193.2.85 +++ NEWS 25 Aug 2005 13:10:58 -0000 1.1193.2.86 @@ -52,6 +52,11 @@ Extension Modules ----------------- +- Bug #1215928: Fix bz2.BZ2File.seek() for 64-bit file offsets. + +- Bug #1191043: Fix bz2.BZ2File.(x)readlines() for files containing one line + without newlines. + - Bug #728515: mmap.resize() now resizes the file on Unix as it did on Windows.

1 0

python/dist/src/Lib/test test_bz2.py, 1.16.2.1, 1.16.2.2
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5002/Lib/test Modified Files: Tag: release24-maint test_bz2.py Log Message: Backport fixes for bugs #1191043 and #1215928. Index: test_bz2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bz2.py,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -d -r1.16.2.1 -r1.16.2.2 --- test_bz2.py 3 Jun 2005 19:45:53 -0000 1.16.2.1 +++ test_bz2.py 25 Aug 2005 13:10:58 -0000 1.16.2.2 @@ -37,7 +37,7 @@ return bz2.decompress(data) class BZ2FileTest(BaseTest): - "Test MCRYPT type miscelaneous methods." + "Test BZ2File type miscellaneous methods." def setUp(self): self.filename = TESTFN @@ -245,6 +245,22 @@ self.assertEqual(f.tell(), len(self.DATA)) f.close() + def testBug1191043(self): + # readlines() for files containing no newline + data = 'BZh91AY&SY\xd9b\x89]\x00\x00\x00\x03\x80\x04\x00\x02\x00\x0c\x00 \x00!\x9ah3M\x13<]\xc9\x14\xe1BCe\x8a%t' + f = open(self.filename, "wb") + f.write(data) + f.close() + bz2f = BZ2File(self.filename) + lines = bz2f.readlines() + bz2f.close() + self.assertEqual(lines, ['Test']) + bz2f = BZ2File(self.filename) + xlines = bz2f.xreadlines() + bz2f.close() + self.assertEqual(lines, ['Test']) + + class BZ2CompressorTest(BaseTest): def testCompress(self): # "Test BZ2Compressor.compress()/flush()"

1 0

python/dist/src/Misc NEWS,1.1351,1.1352
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4953/Misc Modified Files: NEWS Log Message: Correcting my last BZ2 entry. Adding one for #1215928. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1351 retrieving revision 1.1352 diff -u -d -r1.1351 -r1.1352 --- NEWS 25 Aug 2005 11:03:38 -0000 1.1351 +++ NEWS 25 Aug 2005 13:10:41 -0000 1.1352 @@ -130,6 +130,11 @@ Extension Modules ----------------- +- Bug #1191043: Fix bz2.BZ2File.seek() for 64-bit file offsets. + +- Bug #1215928: Fix bz2.BZ2File.(x)readlines for files containing one + line without newlines. + - Bug #728515: mmap.resize() now resizes the file on Unix as it did on Windows. @@ -1601,9 +1606,6 @@ Extension modules ----------------- -- Fix bz2.BZ2File.(x)readlines() for files containing one line without - newlines. - - Added socket.getservbyport(), and make the second argument in getservbyname() and getservbyport() optional.

1 0

python/dist/src/Doc/lib libcookie.tex,1.13,1.14
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv814/Doc/lib Modified Files: libcookie.tex Log Message: Once upon a time, I used to know TeX... Index: libcookie.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcookie.tex,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- libcookie.tex 24 Aug 2005 22:34:21 -0000 1.13 +++ libcookie.tex 25 Aug 2005 12:51:16 -0000 1.14 @@ -98,9 +98,9 @@ Return a string representation suitable to be sent as HTTP headers. \var{attrs} and \var{header} are sent to each \class{Morsel}'s \method{output()} method. \var{sep} is used to join the headers -together, and is by default the combination '\r\n' (CRLF). -\versionchanged[The default separator has been changed from '\n' to match the cookie -specification]{2.5} +together, and is by default the combination \code{'\e r\e n'} (CRLF). +\versionchanged[The default separator has been changed from \code{'\e n'} +to match the cookie specification]{2.5} \end{methoddesc} \begin{methoddesc}[BaseCookie]{js_output}{\optional{attrs}}

1 0

python/dist/src/Doc/lib libcookie.tex,1.12,1.13
by birkenfeld＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27394/Doc/lib Modified Files: libcookie.tex Log Message: patch #848017: make Cookie more RFC-compliant. Index: libcookie.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcookie.tex,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- libcookie.tex 31 May 2004 18:22:39 -0000 1.12 +++ libcookie.tex 24 Aug 2005 22:34:21 -0000 1.13 @@ -98,7 +98,9 @@ Return a string representation suitable to be sent as HTTP headers. \var{attrs} and \var{header} are sent to each \class{Morsel}'s \method{output()} method. \var{sep} is used to join the headers -together, and is by default a newline. +together, and is by default the combination '\r\n' (CRLF). +\versionchanged[The default separator has been changed from '\n' to match the cookie +specification]{2.5} \end{methoddesc} \begin{methoddesc}[BaseCookie]{js_output}{\optional{attrs}} @@ -195,32 +197,32 @@ >>> C["fig"] = "newton" >>> C["sugar"] = "wafer" >>> print C # generate HTTP headers -Set-Cookie: sugar=wafer; -Set-Cookie: fig=newton; +Set-Cookie: sugar=wafer +Set-Cookie: fig=newton >>> print C.output() # same thing -Set-Cookie: sugar=wafer; -Set-Cookie: fig=newton; +Set-Cookie: sugar=wafer +Set-Cookie: fig=newton >>> C = Cookie.SmartCookie() >>> C["rocky"] = "road" >>> C["rocky"]["path"] = "/cookie" >>> print C.output(header="Cookie:") -Cookie: rocky=road; Path=/cookie; +Cookie: rocky=road; Path=/cookie >>> print C.output(attrs=[], header="Cookie:") -Cookie: rocky=road; +Cookie: rocky=road >>> C = Cookie.SmartCookie() >>> C.load("chips=ahoy; vienna=finger") # load from a string (HTTP header) >>> print C -Set-Cookie: vienna=finger; -Set-Cookie: chips=ahoy; +Set-Cookie: vienna=finger +Set-Cookie: chips=ahoy >>> C = Cookie.SmartCookie() >>> C.load('keebler="E=everybody; L=\\"Loves\\"; fudge=\\012;";') >>> print C -Set-Cookie: keebler="E=everybody; L=\"Loves\"; fudge=\012;"; +Set-Cookie: keebler="E=everybody; L=\"Loves\"; fudge=\012;" >>> C = Cookie.SmartCookie() >>> C["oreo"] = "doublestuff" >>> C["oreo"]["path"] = "/" >>> print C -Set-Cookie: oreo=doublestuff; Path=/; +Set-Cookie: oreo=doublestuff; Path=/ >>> C = Cookie.SmartCookie() >>> C["twix"] = "none for you" >>> C["twix"].value @@ -233,8 +235,8 @@ >>> C["string"].value 'seven' >>> print C -Set-Cookie: number=7; -Set-Cookie: string=seven; +Set-Cookie: number=7 +Set-Cookie: string=seven >>> C = Cookie.SerialCookie() >>> C["number"] = 7 >>> C["string"] = "seven" @@ -243,8 +245,8 @@ >>> C["string"].value 'seven' >>> print C -Set-Cookie: number="I7\012."; -Set-Cookie: string="S'seven'\012p1\012."; +Set-Cookie: number="I7\012." +Set-Cookie: string="S'seven'\012p1\012." >>> C = Cookie.SmartCookie() >>> C["number"] = 7 >>> C["string"] = "seven" @@ -253,6 +255,6 @@ >>> C["string"].value 'seven' >>> print C -Set-Cookie: number="I7\012."; -Set-Cookie: string=seven; +Set-Cookie: number="I7\012." +Set-Cookie: string=seven \end{verbatim}

2 1

python/dist/src/Lib/encodings idna.py, 1.4, 1.4.4.1
by loewis＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Lib/encodings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11298/Lib/encodings Modified Files: Tag: release24-maint idna.py Log Message: Make IDNA return an empty string when the input is empty. Fixes #1163178. Index: idna.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/encodings/idna.py,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -d -r1.4 -r1.4.4.1 --- idna.py 23 Mar 2004 23:40:36 -0000 1.4 +++ idna.py 25 Aug 2005 11:04:04 -0000 1.4.4.1 @@ -149,6 +149,9 @@ # IDNA is quite clear that implementations must be strict raise UnicodeError, "unsupported error handling "+errors + if not input: + return "", 0 + result = [] labels = dots.split(input) if labels and len(labels[-1])==0: @@ -166,6 +169,9 @@ if errors != 'strict': raise UnicodeError, "Unsupported error handling "+errors + if not input: + return u"", 0 + # IDNA allows decoding to operate on Unicode strings, too. if isinstance(input, unicode): labels = dots.split(input)

1 0

python/dist/src/Misc NEWS, 1.1193.2.84, 1.1193.2.85
by loewis＠users.sourceforge.net 25 Aug '05

25 Aug '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11298/Misc Modified Files: Tag: release24-maint NEWS Log Message: Make IDNA return an empty string when the input is empty. Fixes #1163178. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.84 retrieving revision 1.1193.2.85 diff -u -d -r1.1193.2.84 -r1.1193.2.85 --- NEWS 25 Aug 2005 07:17:37 -0000 1.1193.2.84 +++ NEWS 25 Aug 2005 11:04:04 -0000 1.1193.2.85 @@ -68,6 +68,8 @@ Library ------- +- Bug #1163178: Make IDNA return an empty string when the input is empty. + - Bug #1121494: distutils.dir_utils.mkpath now accepts Unicode strings. - Bug #1178484: Return complete lines from codec stream readers

1 0