Mailman 3 September 2003 - Python-checkins

python/dist/src/Modules _bsddb.c,1.18,1.19
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv14110/extsrc Modified Files: _bsddb.c Log Message: Adds basic support for BerkeleyDB 4.2.x. Compiles and passes tests; new features in BerkeleyDB not exposed. notably: the DB_MPOOLFILE interface has not yet been wrapped in an object. Adds support for building and installing bsddb3 in python2.3 that has an older version of this module installed as bsddb without conflicts. The pybsddb.sf.net build/packaged version of the module uses a dynamicly loadable module called _pybsddb rather than _bsddb. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** _bsddb.c 28 Aug 2003 21:50:30 -0000 1.18 --- _bsddb.c 21 Sep 2003 00:08:14 -0000 1.19 *************** *** 37,41 **** * Handwritten code to wrap version 3.x of the Berkeley DB library, * written to replace a SWIG-generated file. It has since been updated ! * to compile with BerkeleyDB versions 3.2 through 4.1. * * This module was started by Andrew Kuchling to remove the dependency --- 37,41 ---- * Handwritten code to wrap version 3.x of the Berkeley DB library, * written to replace a SWIG-generated file. It has since been updated ! * to compile with BerkeleyDB versions 3.2 through 4.2. * * This module was started by Andrew Kuchling to remove the dependency *************** *** 94,98 **** #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.1.6" static char *rcs_id = "$Id$"; --- 94,98 ---- #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.2.0" static char *rcs_id = "$Id$"; *************** *** 2168,2171 **** --- 2168,2182 ---- if (outFileName) fclose(outFile); + + /* DB.verify acts as a DB handle destructor (like close); this was + * documented in BerkeleyDB 4.2 but had the undocumented effect + * of not being safe in prior versions while still requiring an explicit + * DB.close call afterwards. Lets call close for the user to emulate + * the safe 4.2 behaviour. */ + #if (DBVER <= 41) + self->db->close(self->db, 0); + #endif + self->db = NULL; + RETURN_IF_ERR(); RETURN_NONE(); *************** *** 4341,4345 **** #define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME) ! DL_EXPORT(void) init_bsddb(void) --- 4352,4357 ---- #define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME) ! #define MODULE_NAME_MAX_LEN 11 ! static char _bsddbModuleName[MODULE_NAME_MAX_LEN+1] = "_bsddb"; DL_EXPORT(void) init_bsddb(void) *************** *** 4366,4370 **** /* Create the module and add the functions */ ! m = Py_InitModule("_bsddb", bsddb_methods); /* Add some symbolic constants to the module */ --- 4378,4382 ---- /* Create the module and add the functions */ ! m = Py_InitModule(_bsddbModuleName, bsddb_methods); /* Add some symbolic constants to the module */ *************** *** 4387,4391 **** --- 4399,4409 ---- ADD_INT(d, DB_MAX_RECORDS); + #if (DBVER >= 42) + ADD_INT(d, DB_RPCCLIENT); + #else ADD_INT(d, DB_CLIENT); + /* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */ + _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); + #endif ADD_INT(d, DB_XA_CREATE); *************** *** 4536,4540 **** ADD_INT(d, DB_CURLSN); #endif ! #if (DBVER >= 33) ADD_INT(d, DB_COMMIT); #endif --- 4554,4558 ---- ADD_INT(d, DB_CURLSN); #endif ! #if ((DBVER >= 33) && (DBVER <= 41)) ADD_INT(d, DB_COMMIT); #endif *************** *** 4611,4614 **** --- 4629,4644 ---- #endif + #if (DBVER >= 42) + ADD_INT(d, DB_TIME_NOTGRANTED); + ADD_INT(d, DB_TXN_NOT_DURABLE); + ADD_INT(d, DB_TXN_WRITE_NOSYNC); + ADD_INT(d, DB_LOG_AUTOREMOVE); + ADD_INT(d, DB_DIRECT_LOG); + ADD_INT(d, DB_DIRECT_DB); + ADD_INT(d, DB_INIT_REP); + ADD_INT(d, DB_ENCRYPT); + ADD_INT(d, DB_CHKSUM); + #endif + #if (DBVER >= 41) ADD_INT(d, DB_ENCRYPT_AES); *************** *** 4686,4688 **** --- 4716,4727 ---- Py_FatalError("can't initialize module _bsddb"); } + } + + /* allow this module to be named _pybsddb so that it can be installed + * and imported on top of python >= 2.3 that includes its own older + * copy of the library named _bsddb without importing the old version. */ + DL_EXPORT(void) init_pybsddb(void) + { + strncpy(_bsddbModuleName, "_pybsddb", MODULE_NAME_MAX_LEN); + init_bsddb(); }

1 0

python/dist/src/Lib/bsddb __init__.py, 1.8, 1.9 db.py, 1.2, 1.3 dbshelve.py, 1.8, 1.9 dbtables.py, 1.8, 1.9 dbutils.py, 1.6, 1.7
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv14110/bsddb Modified Files: __init__.py db.py dbshelve.py dbtables.py dbutils.py Log Message: Adds basic support for BerkeleyDB 4.2.x. Compiles and passes tests; new features in BerkeleyDB not exposed. notably: the DB_MPOOLFILE interface has not yet been wrapped in an object. Adds support for building and installing bsddb3 in python2.3 that has an older version of this module installed as bsddb without conflicts. The pybsddb.sf.net build/packaged version of the module uses a dynamicly loadable module called _pybsddb rather than _bsddb. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** __init__.py 20 Sep 2003 23:51:34 -0000 1.8 --- __init__.py 21 Sep 2003 00:08:14 -0000 1.9 *************** *** 34,42 **** ! """Support for BerkeleyDB 3.1 through 4.1. """ try: ! import _bsddb except ImportError: # Remove ourselves from sys.modules --- 34,49 ---- ! """Support for BerkeleyDB 3.2 through 4.2. """ try: ! if __name__ == 'bsddb3': ! # import _pybsddb binary as it should be the more recent version from ! # a standalone pybsddb addon package than the version included with ! # python as bsddb._bsddb. ! import _pybsddb ! _bsddb = _pybsddb ! else: ! import _bsddb except ImportError: # Remove ourselves from sys.modules Index: db.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/db.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db.py 19 Nov 2002 17:48:48 -0000 1.2 --- db.py 21 Sep 2003 00:08:14 -0000 1.3 *************** *** 38,44 **** # it just simply imports everything from _db. ! from _bsddb import * ! from _bsddb import __version__ ! if version() < (3, 1, 0): ! raise ImportError, "BerkeleyDB 3.x symbols not found. Perhaps python was statically linked with an older version?" --- 38,51 ---- # it just simply imports everything from _db. ! if __name__[:len('bsddb3.')] == 'bsddb3.': ! # import _pybsddb binary as it should be the more recent version from ! # a standalone pybsddb addon package than the version included with ! # python as bsddb._bsddb. ! from _pybsddb import * ! from _pybsddb import __version__ ! else: ! from _bsddb import * ! from _bsddb import __version__ ! if version() < (3, 2, 0): ! raise ImportError, "correct BerkeleyDB symbols not found. Perhaps python was statically linked with an older version?" Index: dbshelve.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbshelve.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dbshelve.py 24 Apr 2003 16:02:46 -0000 1.8 --- dbshelve.py 21 Sep 2003 00:08:14 -0000 1.9 *************** *** 36,45 **** # DictMixin is new in Python 2.3 class DictMixin: pass ! try: ! # For Python 2.3 ! from bsddb import db ! except ImportError: ! # For earlier Pythons w/distutils pybsddb ! from bsddb3 import db #------------------------------------------------------------------------ --- 36,40 ---- # DictMixin is new in Python 2.3 class DictMixin: pass ! import db #------------------------------------------------------------------------ Index: dbtables.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbtables.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dbtables.py 9 Jul 2003 04:45:59 -0000 1.8 --- dbtables.py 21 Sep 2003 00:08:14 -0000 1.9 *************** *** 27,35 **** try: # For Python 2.3 from bsddb.db import * - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3.db import * --- 27,35 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3.db import * + except ImportError: # For Python 2.3 from bsddb.db import * Index: dbutils.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbutils.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dbutils.py 28 Jan 2003 17:20:42 -0000 1.6 --- dbutils.py 21 Sep 2003 00:08:14 -0000 1.7 *************** *** 27,36 **** from time import sleep as _sleep ! try: ! # For Python 2.3 ! from bsddb import db ! except ImportError: ! # For earlier Pythons w/distutils pybsddb ! from bsddb3 import db # always sleep at least N seconds between retrys --- 27,31 ---- from time import sleep as _sleep ! import db # always sleep at least N seconds between retrys

1 0

python/dist/src/Lib/bsddb __init__.py,1.7,1.8
by greg＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv11613 Modified Files: __init__.py Log Message: Maintain backwards compatibility with python < 2.3 by dynamically adding the iterator interface for python >= 2.3. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** __init__.py 13 Sep 2003 03:18:34 -0000 1.7 --- __init__.py 20 Sep 2003 23:51:34 -0000 1.8 *************** *** 53,59 **** #---------------------------------------------------------------------- import UserDict ! class _DBWithCursor(UserDict.DictMixin): """ A simple wrapper around DB that makes it look like the bsddbobject in --- 53,88 ---- #---------------------------------------------------------------------- + import sys + + # for backwards compatibility with python versions older than 2.3, the + # iterator interface is dynamically defined and added using a mixin + # class. old python can't tokenize it due to the yield keyword. + if sys.version >= '2.3': + exec """ import UserDict + class _iter_mixin(UserDict.DictMixin): + def __iter__(self): + try: + yield self.first()[0] + next = self.next + while 1: + yield next()[0] + except _bsddb.DBNotFoundError: + return ! def iteritems(self): ! try: ! yield self.first() ! next = self.next ! while 1: ! yield next() ! except _bsddb.DBNotFoundError: ! return ! """ ! else: ! class _iter_mixin: pass ! ! ! class _DBWithCursor(_iter_mixin): """ A simple wrapper around DB that makes it look like the bsddbobject in *************** *** 146,166 **** return self.db.sync() - def __iter__(self): - try: - yield self.first()[0] - next = self.next - while 1: - yield next()[0] - except _bsddb.DBNotFoundError: - return - - def iteritems(self): - try: - yield self.first() - next = self.next - while 1: - yield next() - except _bsddb.DBNotFoundError: - return #---------------------------------------------------------------------- --- 175,178 ----

1 0

python/dist/src/Lib/test test_urllibnet.py, 1.6, 1.7
by tim_one＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv28215/Lib/test Modified Files: test_urllibnet.py Log Message: SF patch 809915: Fix bogus address to hopefully always break. test_bad_address(): Recover from that VeriSign thought it would boost its corporate coffers to start resolving http://www.sadflkjsasadf.com/. Bugfix candidate -- although the bug is more VeriSign's than Python's! Index: test_urllibnet.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllibnet.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_urllibnet.py 17 Jul 2003 16:31:00 -0000 1.6 --- test_urllibnet.py 20 Sep 2003 22:16:26 -0000 1.7 *************** *** 104,108 **** # address. self.assertRaises(IOError, ! urllib.urlopen, "http://www.sadflkjsasadf.com/") class urlretrieveNetworkTests(unittest.TestCase): --- 104,115 ---- # address. self.assertRaises(IOError, ! # SF patch 809915: In Sep 2003, VeriSign started ! # highjacking invalid .com and .net addresses to ! # boost traffic to their own site. This test ! # started failing then. One hopes the .invalid ! # domain will be spared to serve its defined ! # purpose. ! # urllib.urlopen, "http://www.sadflkjsasadf.com/") ! urllib.urlopen, "http://www.python.invalid/") class urlretrieveNetworkTests(unittest.TestCase):

1 0

python/dist/src/Lib/test regrtest.py,1.145,1.146
by tim_one＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv26340/Lib/test Modified Files: regrtest.py Log Message: test__locale (two underscores) can't pass on Windows: RADIXCHAR doesn't exist, and neither do any of the specific 5-letter locale names the test is looking for. Index: regrtest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** regrtest.py 23 Jul 2003 00:30:39 -0000 1.145 --- regrtest.py 20 Sep 2003 22:06:13 -0000 1.146 *************** *** 555,558 **** --- 555,559 ---- 'win32': """ + test__locale test_al test_bsddb185

1 0

python/dist/src/Misc NEWS,1.857,1.858
by loewis＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv32387/Misc Modified Files: NEWS Log Message: Patch #800697: Add readline.clear_history. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.857 retrieving revision 1.858 diff -C2 -d -r1.857 -r1.858 *** NEWS 20 Sep 2003 15:52:21 -0000 1.857 --- NEWS 20 Sep 2003 16:08:32 -0000 1.858 *************** *** 30,33 **** --- 30,35 ---- ----------------- + - readline.clear_history was added. + - select.select() now accepts sequences for its first three arguments.

1 0

python/dist/src/Modules readline.c,2.64,2.65
by loewis＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv32387/Modules Modified Files: readline.c Log Message: Patch #800697: Add readline.clear_history. Index: readline.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v retrieving revision 2.64 retrieving revision 2.65 diff -C2 -d -r2.64 -r2.65 *** readline.c 17 Jul 2003 16:26:58 -0000 2.64 --- readline.c 20 Sep 2003 16:08:33 -0000 2.65 *************** *** 413,416 **** --- 413,434 ---- + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + + /* Exported function to clear the current history */ + + static PyObject * + py_clear_history(PyObject *self, PyObject *noarg) + { + clear_history(); + Py_INCREF(Py_None); + return Py_None; + } + + PyDoc_STRVAR(doc_clear_history, + "clear_history() -> None\n\ + Clear the current readline history."); + #endif + + /* Exported function to insert text into the line buffer */ *************** *** 484,487 **** --- 502,508 ---- {"set_pre_input_hook", set_pre_input_hook, METH_VARARGS, doc_set_pre_input_hook}, + #endif + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + {"clear_history", py_clear_history, METH_NOARGS, doc_clear_history}, #endif {0, 0}

1 0

python/dist/src/Doc/lib libreadline.tex, 1.10, 1.11
by loewis＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv32387/Doc/lib Modified Files: libreadline.tex Log Message: Patch #800697: Add readline.clear_history. Index: libreadline.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libreadline.tex,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** libreadline.tex 21 Feb 2003 20:11:09 -0000 1.10 --- libreadline.tex 20 Sep 2003 16:08:32 -0000 1.11 *************** *** 43,46 **** --- 43,52 ---- \end{funcdesc} + \begin{funcdesc}{clear_history}{} + Clear the current history. (Note: this function is not available if + the installed version of GNU readline doesn't support it.) + \versionadded{2.4} + \end{funcdesc} + \begin{funcdesc}{get_history_length}{} Return the desired length of the history file. Negative values imply

1 0

python/dist/src/Doc/whatsnew whatsnew24.tex, 1.2, 1.3
by loewis＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1:/tmp/cvs-serv29956/Doc/whatsnew Modified Files: whatsnew24.tex Log Message: Patch #707167: Pass dircache exceptions to the caller. Fixes #682813. Not backported because of behaviour change. Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** whatsnew24.tex 13 Aug 2003 23:09:44 -0000 1.2 --- whatsnew24.tex 20 Sep 2003 15:52:20 -0000 1.3 *************** *** 125,129 **** \begin{itemize} ! \item Everything is all in the details! \end{itemize} --- 125,130 ---- \begin{itemize} ! \item dircache.listdir now passes exceptions to the caller, ! instead of returning empty lists. \end{itemize}

1 0

python/dist/src/Lib/test test_dircache.py, 1.5, 1.6
by loewis＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv29956/Lib/test Modified Files: test_dircache.py Log Message: Patch #707167: Pass dircache exceptions to the caller. Fixes #682813. Not backported because of behaviour change. Index: test_dircache.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dircache.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_dircache.py 23 Jul 2002 19:03:50 -0000 1.5 --- test_dircache.py 20 Sep 2003 15:52:21 -0000 1.6 *************** *** 57,61 **** ## UNSUCCESSFUL CASES ! self.assertEquals(dircache.listdir(self.tempdir+"_nonexistent"), []) def test_annotate(self): --- 57,61 ---- ## UNSUCCESSFUL CASES ! self.assertRaises(OSError, dircache.listdir, self.tempdir+"_nonexistent") def test_annotate(self):

1 0