Mailman 3 July 2005 - Python-checkins

python/dist/src/Lib/test test_urlparse.py, 1.14, 1.15
by fdrake＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26623/Lib/test Modified Files: test_urlparse.py Log Message: add support for svn: and svn+ssh: URL schemes to urlparse Index: test_urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urlparse.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_urlparse.py 9 Jan 2005 15:29:10 -0000 1.14 +++ test_urlparse.py 29 Jul 2005 15:56:32 -0000 1.15 @@ -35,6 +35,11 @@ '', '', ''), ('mms', 'wms.sys.hinet.net', '/cts/Drama/09006251100.asf', '', '')), + ('svn+ssh://svn.zope.org/repos/main/ZConfig/trunk/', + ('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/', + '', '', ''), + ('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/', + '', '')) ] for url, parsed, split in testcases: self.checkRoundtrips(url, parsed, split)

1 0

python/dist/src/Doc/lib liblogging.tex, 1.37, 1.38
by vsajip＠users.sourceforge.net July 29, 2005

July 29, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11567 Modified Files: liblogging.tex Log Message: Documentation added about changes in 2.4 to basicConfig(), including documentation of the keyword arguments. A version change note was also added to the basic example. Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- liblogging.tex 5 Jun 2005 20:39:36 -0000 1.37 +++ liblogging.tex 29 Jul 2005 11:52:19 -0000 1.38 @@ -258,13 +258,32 @@ it as a \class{LogRecord} instance at the receiving end. \end{funcdesc} -\begin{funcdesc}{basicConfig}{} +\begin{funcdesc}{basicConfig}{\optional{**kwargs}} Does basic configuration for the logging system by creating a \class{StreamHandler} with a default \class{Formatter} and adding it to the root logger. The functions \function{debug()}, \function{info()}, \function{warning()}, \function{error()} and \function{critical()} will call \function{basicConfig()} automatically if no handlers are defined for the root logger. + +\versionchanged[Formerly, \function{basicConfig} did not take any keyword +arguments]{2.4} + +The following keyword arguments are supported. + +\begin{tableii}{l|l}{code}{Format}{Description} +\lineii{filename}{Specifies that a FileHandler be created, using the +specified filename, rather than a StreamHandler.} +\lineii{filemode}{Specifies the mode to open the file, if filename is +specified (if filemode is unspecified, it defaults to 'a').} +\lineii{format}{Use the specified format string for the handler.} +\lineii{datefmt}{Use the specified date/time format.} +\lineii{level}{Set the root logger level to the specified level.} +\lineii{stream}{Use the specified stream to initialize the StreamHandler. +Note that this argument is incompatible with 'filename' - if both +are present, 'stream' is ignored.} +\end{tableii} + \end{funcdesc} \begin{funcdesc}{shutdown}{} @@ -415,6 +434,9 @@ \subsection{Basic example \label{minimal-example}} +\versionchanged[formerly \function{basicConfig} did not take any keyword +arguments]{2.4} + The \module{logging} package provides a lot of flexibility, and its configuration can appear daunting. This section demonstrates that simple use of the logging package is possible.

1 0

python/dist/src/Lib/test string_tests.py, 1.44, 1.45
by doerwalter＠users.sourceforge.net July 28, 2005

July 28, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7035/Lib/test Modified Files: string_tests.py Log Message: Disable encoding/decoding test, if unicode is disabled. Index: string_tests.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- string_tests.py 20 Feb 2005 09:54:53 -0000 1.44 +++ string_tests.py 28 Jul 2005 16:49:15 -0000 1.45 @@ -737,26 +737,27 @@ # Additional tests that only work with # 8bit compatible object, i.e. str and UserString - def test_encoding_decoding(self): - codecs = [('rot13', 'uryyb jbeyq'), - ('base64', 'aGVsbG8gd29ybGQ=\n'), - ('hex', '68656c6c6f20776f726c64'), - ('uu', 'begin 666 <data>\n+:&5L;&\\@=V]R;&0 \n \nend\n')] - for encoding, data in codecs: - self.checkequal(data, 'hello world', 'encode', encoding) - self.checkequal('hello world', data, 'decode', encoding) - # zlib is optional, so we make the test optional too... - try: - import zlib - except ImportError: - pass - else: - data = 'x\x9c\xcbH\xcd\xc9\xc9W(\xcf/\xcaI\x01\x00\x1a\x0b\x04]' - self.checkequal(data, 'hello world', 'encode', 'zlib') - self.checkequal('hello world', data, 'decode', 'zlib') + if test_support.have_unicode: + def test_encoding_decoding(self): + codecs = [('rot13', 'uryyb jbeyq'), + ('base64', 'aGVsbG8gd29ybGQ=\n'), + ('hex', '68656c6c6f20776f726c64'), + ('uu', 'begin 666 <data>\n+:&5L;&\\@=V]R;&0 \n \nend\n')] + for encoding, data in codecs: + self.checkequal(data, 'hello world', 'encode', encoding) + self.checkequal('hello world', data, 'decode', encoding) + # zlib is optional, so we make the test optional too... + try: + import zlib + except ImportError: + pass + else: + data = 'x\x9c\xcbH\xcd\xc9\xc9W(\xcf/\xcaI\x01\x00\x1a\x0b\x04]' + self.checkequal(data, 'hello world', 'encode', 'zlib') + self.checkequal('hello world', data, 'decode', 'zlib') - self.checkraises(TypeError, 'xyz', 'decode', 42) - self.checkraises(TypeError, 'xyz', 'encode', 42) + self.checkraises(TypeError, 'xyz', 'decode', 42) + self.checkraises(TypeError, 'xyz', 'encode', 42) class MixinStrUnicodeTest:

1 0

python/dist/src/Modules fcntlmodule.c,2.44,2.45
by perky＠users.sourceforge.net July 28, 2005

July 28, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32262/Modules Modified Files: fcntlmodule.c Log Message: Fix a typo. (found by Jong-uk Kim) Index: fcntlmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v retrieving revision 2.44 retrieving revision 2.45 diff -u -d -r2.44 -r2.45 --- fcntlmodule.c 27 Jul 2005 20:24:30 -0000 2.44 +++ fcntlmodule.c 28 Jul 2005 05:57:19 -0000 2.45 @@ -173,7 +173,7 @@ arg = 0; if (!PyArg_ParseTuple(args, "O&I|i;ioctl requires a file or file descriptor," - " an integer and optionally a integer or buffer argument", + " an integer and optionally an integer or buffer argument", conv_descriptor, &fd, &code, &arg)) { return NULL; }

1 0

python/dist/src/Python newcompile.c, 1.1.2.109, 1.1.2.110
by bcannon＠users.sourceforge.net July 28, 2005

July 28, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31317/Python Modified Files: Tag: ast-branch newcompile.c Log Message: Fix the creation of lnotab to emit ``\x00x01`` for the first line of code (such as def statements). Causes test_dis:test_dis to pass. Partially fixes bug #1246473. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.109 retrieving revision 1.1.2.110 diff -u -d -r1.1.2.109 -r1.1.2.110 --- newcompile.c 11 Jul 2005 03:43:56 -0000 1.1.2.109 +++ newcompile.c 28 Jul 2005 05:50:01 -0000 1.1.2.110 @@ -3339,17 +3339,22 @@ a->a_lnotab_off += ncodes * 2; } - if (d_bytecode) { - len = PyString_GET_SIZE(a->a_lnotab); - if (a->a_lnotab_off + 2 >= len) { - if (_PyString_Resize(&a->a_lnotab, len * 2) < 0) - return 0; - } - lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off; - a->a_lnotab_off += 2; + len = PyString_GET_SIZE(a->a_lnotab); + if (a->a_lnotab_off + 2 >= len) { + if (_PyString_Resize(&a->a_lnotab, len * 2) < 0) + return 0; + } + lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off; + + a->a_lnotab_off += 2; + if (d_bytecode) { *lnotab++ = d_bytecode; *lnotab++ = d_lineno; } + else { /* First line of a block; def stmt, etc. */ + *lnotab++ = 0; + *lnotab++ = 1; + } a->a_lineno = i->i_lineno; a->a_lineno_off = a->a_offset; return 1;

1 0

python/nondist/sandbox/set setobject.c,1.1,1.2
by rhettinger＠users.sourceforge.net July 27, 2005

July 27, 2005

Update of /cvsroot/python/python/nondist/sandbox/set In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12069 Modified Files: setobject.c Log Message: Restore original intersection_update logic. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/set/setobject.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- setobject.c 22 Jul 2005 15:32:29 -0000 1.1 +++ setobject.c 27 Jul 2005 23:38:40 -0000 1.2 @@ -1009,41 +1009,53 @@ \n\ (i.e. all elements that are in both sets.)"); + +static void +set_swap_bodys(PySetObject *a, PySetObject *b) +{ + int t; + PySetEntry *u; + PySetEntry *(*f)(PySetObject *mp, PyObject *key, long hash); + PySetEntry tab[PySet_MINSIZE]; + long h; + + t = a->ma_fill; a->ma_fill = b->ma_fill; b->ma_fill = t; + t = a->ma_used; a->ma_used = b->ma_used; b->ma_used = t; + t = a->ma_mask; a->ma_mask = b->ma_mask; b->ma_mask = t; + + u = a->ma_table; + if (a->ma_table == a->ma_smalltable) + u = b->ma_smalltable; + a->ma_table = b->ma_table; + if (b->ma_table == b->ma_smalltable) + a->ma_table = a->ma_smalltable; + b->ma_table = u; + + f = a->ma_lookup; a->ma_lookup = b->ma_lookup; b->ma_lookup = f; + + if (a->ma_table == a->ma_smalltable || b->ma_table == b->ma_smalltable) { + memcpy(tab, a->ma_smalltable, sizeof(tab)); + memcpy(a->ma_smalltable, b->ma_smalltable, sizeof(tab)); + memcpy(b->ma_smalltable, tab, sizeof(tab)); + } + + h = a->hash; a->hash = b->hash; b->hash = h; +} + static PyObject *set_clear(PySetObject *so); /// XXX remove forward declaration static int set_tp_clear(PySetObject *so); /// XXX remove forward declaration static PyObject * set_intersection_update(PySetObject *so, PyObject *other) { -/* // Hmm, this made the timings slower - PyObject *tmp, *key; - int pos = 0; + PyObject *tmp; tmp = set_intersection(so, other); if (tmp == NULL) return NULL; - - while (set_next_internal(so, &pos, &key)) { - if (!set_contains_internal((PySetObject *)tmp, key)) { - if (set_remove_internal(so, key) == -1) { - Py_DECREF(tmp); - return NULL; - } - } - } + set_swap_bodys(so, (PySetObject *)tmp); Py_DECREF(tmp); Py_RETURN_NONE; -*/ - - PyObject *tmp, *rv; - - tmp = set_intersection(so, other); - if (tmp == NULL) - return NULL; - set_tp_clear(so); - rv = set_update(so, tmp); - Py_DECREF(tmp); - return rv; } PyDoc_STRVAR(intersection_update_doc,

1 0

python/dist/src/Misc NEWS,1.1325,1.1326
by mwh＠users.sourceforge.net July 27, 2005

July 27, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29673/Misc Modified Files: NEWS Log Message: This is barry-scott's patch: [ 1231069 ] ioctl has problem with -ive request codes by using the 'I' not the 'i' format code to PyArg_ParseTuple(). Backport candidate? Maybe... Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1325 retrieving revision 1.1326 diff -u -d -r1.1325 -r1.1326 --- NEWS 27 Jul 2005 00:00:44 -0000 1.1325 +++ NEWS 27 Jul 2005 20:24:40 -0000 1.1326 @@ -117,6 +117,10 @@ Extension Modules ----------------- +- Patch #1231069: The fcntl.ioctl function now uses the 'I' code for + the request code argument, which results in more C-like behaviour + for large or negative values. + - Bug #1234979: For the argument of thread.Lock.acquire, the Windows implemented treated all integer values except 1 as false.

1 0

python/dist/src/Modules fcntlmodule.c,2.43,2.44
by mwh＠users.sourceforge.net July 27, 2005

July 27, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29673/Modules Modified Files: fcntlmodule.c Log Message: This is barry-scott's patch: [ 1231069 ] ioctl has problem with -ive request codes by using the 'I' not the 'i' format code to PyArg_ParseTuple(). Backport candidate? Maybe... Index: fcntlmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v retrieving revision 2.43 retrieving revision 2.44 diff -u -d -r2.43 -r2.44 --- fcntlmodule.c 30 Nov 2004 14:31:54 -0000 2.43 +++ fcntlmodule.c 27 Jul 2005 20:24:30 -0000 2.44 @@ -102,7 +102,7 @@ int mutate_arg = 1; char buf[1024]; - if (PyArg_ParseTuple(args, "O&iw#|i:ioctl", + if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl", conv_descriptor, &fd, &code, &str, &len, &mutate_arg)) { char *arg; @@ -151,7 +151,7 @@ } PyErr_Clear(); - if (PyArg_ParseTuple(args, "O&is#:ioctl", + if (PyArg_ParseTuple(args, "O&Is#:ioctl", conv_descriptor, &fd, &code, &str, &len)) { if (len > sizeof buf) { PyErr_SetString(PyExc_ValueError, @@ -172,7 +172,7 @@ PyErr_Clear(); arg = 0; if (!PyArg_ParseTuple(args, - "O&i|i;ioctl requires a file or file descriptor," + "O&I|i;ioctl requires a file or file descriptor," " an integer and optionally a integer or buffer argument", conv_descriptor, &fd, &code, &arg)) { return NULL;

1 0

python/dist/src/Misc developers.txt,1.16,1.17
by rhettinger＠users.sourceforge.net July 27, 2005

July 27, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22821 Modified Files: developers.txt Log Message: Update permissions for Johannes Gijsbers. Index: developers.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/developers.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- developers.txt 14 Jul 2005 17:34:00 -0000 1.16 +++ developers.txt 27 Jul 2005 17:59:03 -0000 1.17 @@ -50,6 +50,8 @@ Permissions Dropped on Request ------------------------------ +- Johannes Gijsbers sent a drop request. 27 July 2005 RDH + - Flovis Bruynooghe sent a drop request. 14 July 2005 RDH - Paul Prescod sent a drop request. 30 Apr 2005 RDH

1 0

python/dist/src/Misc NEWS,1.1324,1.1325
by gvanrossum＠users.sourceforge.net July 27, 2005

July 27, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18697 Modified Files: NEWS Log Message: Ouch, move that comment to the right place. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1324 retrieving revision 1.1325 diff -u -d -r1.1324 -r1.1325 --- NEWS 26 Jul 2005 23:57:46 -0000 1.1324 +++ NEWS 27 Jul 2005 00:00:44 -0000 1.1325 @@ -12,10 +12,6 @@ Core and builtins ----------------- -- Fix a problem in Tkinter introduced by SF patch #869468: delete bogus - __hasattr__ and __delattr__ methods on class Tk that were breaking - Tkdnd. - - SF bug #1238681: freed pointer is used in longobject.c:long_pow(). - SF bug #1229429: PyObject_CallMethod failed to decrement some @@ -174,6 +170,10 @@ Library ------- +- Fix a problem in Tkinter introduced by SF patch #869468: delete bogus + __hasattr__ and __delattr__ methods on class Tk that were breaking + Tkdnd. + - Bug #1015140: disambiguated the term "article id" in nntplib docs and docstrings to either "article number" or "message id".

1 0