Mailman 3 June 2004 - Python-checkins

python/dist/src/Lib urlparse.py,1.44,1.45
by bcannon＠users.sourceforge.net June 29, 2004

June 29, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14186/Lib Modified Files: urlparse.py Log Message: rsync is now a recognized protocol that uses "netloc" (i.e. specifies a network location) in its addressing. Closes bug #981299. Index: urlparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** urlparse.py 7 May 2004 05:50:35 -0000 1.44 --- urlparse.py 29 Jun 2004 04:02:39 -0000 1.45 *************** *** 14,18 **** uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', ! 'snews', 'prospero', 'rtsp', 'rtspu', ''] non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip'] --- 14,18 ---- uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', ! 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', ''] non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip']

1 0

python/dist/src/Misc NEWS,1.1012,1.1013
by bcannon＠users.sourceforge.net June 29, 2004

June 29, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14186/Misc Modified Files: NEWS Log Message: rsync is now a recognized protocol that uses "netloc" (i.e. specifies a network location) in its addressing. Closes bug #981299. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1012 retrieving revision 1.1013 diff -C2 -d -r1.1012 -r1.1013 *** NEWS 28 Jun 2004 00:50:42 -0000 1.1012 --- NEWS 29 Jun 2004 04:02:40 -0000 1.1013 *************** *** 351,354 **** --- 351,357 ---- ------- + - Bug #981299: rsync is now a recognized protocol that uses a "netloc" portion + of a URL. + - Bug #919012: shutil.move() will not try to move a directory into itself. Thanks Johannes Gijsbers.

1 0

python/dist/src/Doc/ext extending.tex,1.29,1.30
by bcannon＠users.sourceforge.net June 29, 2004

June 29, 2004

Update of /cvsroot/python/python/dist/src/Doc/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12197 Modified Files: extending.tex Log Message: Changed applicable use of ``char *`` declarations that are passed into PyArg_ParseTuple() to ``const char *`` to match the recommendation made in section 1.3 and to support better coding habits. Section 1.8 ("Keyword Parameters for Extension Functions") and it's coding example were not touched since it is stems from an accredited source and thus did not want to step on anyone's toes. Index: extending.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ext/extending.tex,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** extending.tex 27 Jun 2004 04:28:00 -0000 1.29 --- extending.tex 29 Jun 2004 03:48:23 -0000 1.30 *************** *** 71,75 **** spam_system(PyObject *self, PyObject *args) { ! char *command; int sts; --- 71,75 ---- spam_system(PyObject *self, PyObject *args) { ! const char *command; int sts; *************** *** 635,639 **** int i, j; long k, l; ! char *s; int size; --- 635,639 ---- int i, j; long k, l; ! const char *s; int size; *************** *** 660,665 **** \begin{verbatim} { ! char *file; ! char *mode = "r"; int bufsize = 0; ok = PyArg_ParseTuple(args, "s|si", &file, &mode, &bufsize); --- 660,665 ---- \begin{verbatim} { ! const char *file; ! const char *mode = "r"; int bufsize = 0; ok = PyArg_ParseTuple(args, "s|si", &file, &mode, &bufsize); *************** *** 1229,1233 **** \begin{verbatim} static int ! PySpam_System(char *command) { return system(command); --- 1229,1233 ---- \begin{verbatim} static int ! PySpam_System(const char *command) { return system(command); *************** *** 1241,1245 **** spam_system(PyObject *self, PyObject *args) { ! char *command; int sts; --- 1241,1245 ---- spam_system(PyObject *self, PyObject *args) { ! const char *command; int sts;

1 0

python/dist/src/PCbuild pcbuild.sln,1.1,1.2
by loewis＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32022 Modified Files: pcbuild.sln Log Message: Add readme.txt Index: pcbuild.sln =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/pcbuild.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pcbuild.sln 2 Jan 2004 21:13:59 -0000 1.1 --- pcbuild.sln 28 Jun 2004 15:24:23 -0000 1.2 *************** *** 151,154 **** --- 151,157 ---- {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32 EndGlobalSection + GlobalSection(SolutionItems) = postSolution + readme.txt = readme.txt + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection

1 0

python/dist/src/Lib/test test_unicode_file.py, 1.14, 1.15
by rhettinger＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4262 Modified Files: test_unicode_file.py Log Message: Patch from Mark Hammond to fix a test error. Now runs without exception on WinME/98. Index: test_unicode_file.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode_file.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** test_unicode_file.py 21 Mar 2004 20:55:47 -0000 1.14 --- test_unicode_file.py 28 Jun 2004 06:57:19 -0000 1.15 *************** *** 40,54 **** # basename should appear in listdir. path, base = os.path.split(os.path.abspath(filename)) ! if (isinstance (filename, str)): ! new_base = base.decode(TESTFN_ENCODING) ! file_list = [f.decode(TESTFN_ENCODING) for f in os.listdir(path)] ! else: ! new_base = base ! file_list = os.listdir(path) ! new_base = unicodedata.normalize("NFD", new_base) file_list = [unicodedata.normalize("NFD", f) for f in file_list] ! self.failUnless(new_base in file_list) # Do as many "equivalancy' tests as we can - ie, check that although we --- 40,57 ---- # basename should appear in listdir. path, base = os.path.split(os.path.abspath(filename)) ! if isinstance(base, str): ! base = base.decode(TESTFN_ENCODING) ! file_list = os.listdir(path) ! # listdir() with a unicode arg may or may not return Unicode ! # objects, depending on the platform. ! if file_list and isinstance(file_list[0], str): ! file_list = [f.decode(TESTFN_ENCODING) for f in file_list] ! # Normalize the unicode strings, as round-tripping the name via the OS ! # may return a different (but equivalent) value. ! base = unicodedata.normalize("NFD", base) file_list = [unicodedata.normalize("NFD", f) for f in file_list] ! self.failUnless(base in file_list) # Do as many "equivalancy' tests as we can - ie, check that although we

1 0

python/dist/src/Lib/bsddb/test test_associate.py, 1.7, 1.8
by greg＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/bsddb/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11608/Lib/bsddb/test Modified Files: test_associate.py Log Message: Adds support for DB.pget and DBCursor.pget methods. Based on a patch supplied by Ian Ward <ian(a)arevco.ca> on the pybsddb mailing list 2004-03-26. Index: test_associate.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_associate.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_associate.py 12 Feb 2004 17:35:08 -0000 1.7 --- test_associate.py 28 Jun 2004 04:06:49 -0000 1.8 *************** *** 84,87 **** --- 84,88 ---- 53: ("David Lanz", "Heartsounds", "New Age"), 54: ("David Lanz", "Leaves on the Seine", "New Age"), + 99: ("unknown artist", "Unnamed song", "Unknown"), } *************** *** 118,121 **** --- 119,123 ---- def createDB(self): self.primary = db.DB(self.env) + self.primary.set_get_returns_none(2) self.primary.open(self.filename, "primary", self.dbtype, db.DB_CREATE | db.DB_THREAD) *************** *** 137,140 **** --- 139,143 ---- secDB = db.DB(self.env) secDB.set_flags(db.DB_DUP) + secDB.set_get_returns_none(2) secDB.open(self.filename, "secondary", db.DB_BTREE, db.DB_CREATE | db.DB_THREAD) *************** *** 167,170 **** --- 170,183 ---- def finish_test(self, secDB): + # 'Blues' should not be in the secondary database + vals = secDB.pget('Blues') + assert vals == None, vals + + vals = secDB.pget('Unknown') + assert vals[0] == 99 or vals[0] == '99', vals + vals[1].index('Unknown') + vals[1].index('Unnamed') + vals[1].index('unknown') + if verbose: print "Primary key traversal:" *************** *** 188,191 **** --- 201,216 ---- c = secDB.cursor() count = 0 + + # test cursor pget + vals = c.pget('Unknown', flags=db.DB_LAST) + assert vals[1] == 99 or vals[1] == '99', vals + assert vals[0] == 'Unknown' + vals[2].index('Unknown') + vals[2].index('Unnamed') + vals[2].index('unknown') + + vals = c.pget('Unknown', data='wrong value', flags=db.DB_GET_BOTH) + assert vals == None, vals + rec = c.first() assert rec[0] == "Jazz"

1 0

python/dist/src/Lib/bsddb dbobj.py,1.8,1.9
by greg＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11608/Lib/bsddb Modified Files: dbobj.py Log Message: Adds support for DB.pget and DBCursor.pget methods. Based on a patch supplied by Ian Ward <ian(a)arevco.ca> on the pybsddb mailing list 2004-03-26. Index: dbobj.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbobj.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dbobj.py 28 Aug 2003 21:50:30 -0000 1.8 --- dbobj.py 28 Jun 2004 04:06:48 -0000 1.9 *************** *** 135,138 **** --- 135,140 ---- def get(self, *args, **kwargs): return apply(self._cobj.get, args, kwargs) + def pget(self, *args, **kwargs): + return apply(self._cobj.pget, args, kwargs) def get_both(self, *args, **kwargs): return apply(self._cobj.get_both, args, kwargs)

1 0

python/dist/src/Modules _bsddb.c,1.34,1.35
by greg＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11608/Modules Modified Files: _bsddb.c Log Message: Adds support for DB.pget and DBCursor.pget methods. Based on a patch supplied by Ian Ward <ian(a)arevco.ca> on the pybsddb mailing list 2004-03-26. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** _bsddb.c 28 Jun 2004 01:20:40 -0000 1.34 --- _bsddb.c 28 Jun 2004 04:06:47 -0000 1.35 *************** *** 98,102 **** #endif ! #define PY_BSDDB_VERSION "4.2.7" static char *rcs_id = "$Id$"; --- 98,102 ---- #endif ! #define PY_BSDDB_VERSION "4.2.8" static char *rcs_id = "$Id$"; *************** *** 1464,1467 **** --- 1464,1555 ---- } + static PyObject* + DB_pget(DBObject* self, PyObject* args, PyObject* kwargs) + { + int err, flags=0; + PyObject* txnobj = NULL; + PyObject* keyobj; + PyObject* dfltobj = NULL; + PyObject* retval = NULL; + int dlen = -1; + int doff = -1; + DBT key, pkey, data; + DB_TXN *txn = NULL; + char* kwnames[] = {"key", "default", "txn", "flags", "dlen", "doff", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:pget", kwnames, + &keyobj, &dfltobj, &txnobj, &flags, &dlen, + &doff)) + return NULL; + + CHECK_DB_NOT_CLOSED(self); + if (!make_key_dbt(self, keyobj, &key, &flags)) + return NULL; + if (!checkTxnObj(txnobj, &txn)) { + FREE_DBT(key); + return NULL; + } + + CLEAR_DBT(data); + if (CHECK_DBFLAG(self, DB_THREAD)) { + /* Tell BerkeleyDB to malloc the return value (thread safe) */ + data.flags = DB_DBT_MALLOC; + } + if (!add_partial_dbt(&data, dlen, doff)) { + FREE_DBT(key); + return NULL; + } + + CLEAR_DBT(pkey); + pkey.flags = DB_DBT_MALLOC; + + MYDB_BEGIN_ALLOW_THREADS; + err = self->db->pget(self->db, txn, &key, &pkey, &data, flags); + MYDB_END_ALLOW_THREADS; + + if ((err == DB_NOTFOUND) && (dfltobj != NULL)) { + err = 0; + Py_INCREF(dfltobj); + retval = dfltobj; + } + else if ((err == DB_NOTFOUND) && self->moduleFlags.getReturnsNone) { + err = 0; + Py_INCREF(Py_None); + retval = Py_None; + } + else if (!err) { + PyObject *pkeyObj; + PyObject *dataObj; + dataObj = PyString_FromStringAndSize(data.data, data.size); + + if (self->primaryDBType == DB_RECNO || + self->primaryDBType == DB_QUEUE) + pkeyObj = PyInt_FromLong(*(long *)pkey.data); + else + pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size); + + if (flags & DB_SET_RECNO) /* return key , pkey and data */ + { + PyObject *keyObj; + int type = _DB_get_type(self); + if (type == DB_RECNO || type == DB_QUEUE) + keyObj = PyInt_FromLong(*(long *)key.data); + else + keyObj = PyString_FromStringAndSize(key.data, key.size); + retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); + } + else /* return just the pkey and data */ + { + retval = Py_BuildValue("OO", pkeyObj, dataObj); + } + FREE_DBT(pkey); + FREE_DBT(data); + } + FREE_DBT(key); + + RETURN_IF_ERR(); + return retval; + } + /* Return size of entry */ *************** *** 2828,2831 **** --- 2916,3019 ---- } + static PyObject* + DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs) + { + int err, flags=0; + PyObject* keyobj = NULL; + PyObject* dataobj = NULL; + PyObject* retval = NULL; + int dlen = -1; + int doff = -1; + DBT key, pkey, data; + char* kwnames[] = { "key","data", "flags", "dlen", "doff", NULL }; + + CLEAR_DBT(key); + CLEAR_DBT(data); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii:pget", &kwnames[2], + &flags, &dlen, &doff)) + { + PyErr_Clear(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii:pget", + &kwnames[1], + &keyobj, &flags, &dlen, &doff)) + { + PyErr_Clear(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OOi|ii:pget", + kwnames, &keyobj, &dataobj, + &flags, &dlen, &doff)) + { + return NULL; + } + } + } + + CHECK_CURSOR_NOT_CLOSED(self); + + if (keyobj && !make_key_dbt(self->mydb, keyobj, &key, NULL)) + return NULL; + if ( (dataobj && !make_dbt(dataobj, &data)) || + (!add_partial_dbt(&data, dlen, doff)) ) { + FREE_DBT(key); + return NULL; + } + + if (CHECK_DBFLAG(self->mydb, DB_THREAD)) { + data.flags = DB_DBT_MALLOC; + if (!(key.flags & DB_DBT_REALLOC)) { + key.flags |= DB_DBT_MALLOC; + } + } + + CLEAR_DBT(pkey); + pkey.flags = DB_DBT_MALLOC; + + MYDB_BEGIN_ALLOW_THREADS; + err = self->dbc->c_pget(self->dbc, &key, &pkey, &data, flags); + MYDB_END_ALLOW_THREADS; + + if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) { + Py_INCREF(Py_None); + retval = Py_None; + } + else if (makeDBError(err)) { + retval = NULL; + } + else { + PyObject *pkeyObj; + PyObject *dataObj; + dataObj = PyString_FromStringAndSize(data.data, data.size); + + if (self->mydb->primaryDBType == DB_RECNO || + self->mydb->primaryDBType == DB_QUEUE) + pkeyObj = PyInt_FromLong(*(long *)pkey.data); + else + pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size); + + if (flags & DB_SET_RECNO) /* return key, pkey and data */ + { + PyObject *keyObj; + int type = _DB_get_type(self->mydb); + if (type == DB_RECNO || type == DB_QUEUE) + keyObj = PyInt_FromLong(*(long *)key.data); + else + keyObj = PyString_FromStringAndSize(key.data, key.size); + retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); + FREE_DBT(key); + } + else /* return just the pkey and data */ + { + retval = Py_BuildValue("OO", pkeyObj, dataObj); + } + FREE_DBT(pkey); + FREE_DBT(data); + } + /* the only time REALLOC should be set is if we used an integer + * key that make_key_dbt malloc'd for us. always free these. */ + if (key.flags & DB_DBT_REALLOC) { + FREE_DBT(key); + } + return retval; + } + static PyObject* *************** *** 2975,2980 **** } FREE_DBT(data); } - FREE_DBT(key); return retval; --- 3163,3173 ---- } FREE_DBT(data); + FREE_DBT(key); + } + /* the only time REALLOC should be set is if we used an integer + * key that make_key_dbt malloc'd for us. always free these. */ + if (key.flags & DB_DBT_REALLOC) { + FREE_DBT(key); } return retval; *************** *** 3045,3049 **** } /* the only time REALLOC should be set is if we used an integer ! * key that make_dbt_key malloc'd for us. always free these. */ if (key.flags & DB_DBT_REALLOC) { FREE_DBT(key); --- 3238,3242 ---- } /* the only time REALLOC should be set is if we used an integer ! * key that make_key_dbt malloc'd for us. always free these. */ if (key.flags & DB_DBT_REALLOC) { FREE_DBT(key); *************** *** 4184,4187 **** --- 4377,4381 ---- {"fd", (PyCFunction)DB_fd, METH_VARARGS}, {"get", (PyCFunction)DB_get, METH_VARARGS|METH_KEYWORDS}, + {"pget", (PyCFunction)DB_pget, METH_VARARGS|METH_KEYWORDS}, {"get_both", (PyCFunction)DB_get_both, METH_VARARGS|METH_KEYWORDS}, {"get_byteswapped", (PyCFunction)DB_get_byteswapped,METH_VARARGS}, *************** *** 4243,4246 **** --- 4437,4441 ---- {"first", (PyCFunction)DBC_first, METH_VARARGS|METH_KEYWORDS}, {"get", (PyCFunction)DBC_get, METH_VARARGS|METH_KEYWORDS}, + {"pget", (PyCFunction)DBC_pget, METH_VARARGS|METH_KEYWORDS}, {"get_recno", (PyCFunction)DBC_get_recno, METH_VARARGS}, {"last", (PyCFunction)DBC_last, METH_VARARGS|METH_KEYWORDS},

1 0

python/dist/src/Modules _bsddb.c,1.33,1.34
by greg＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18311/Modules Modified Files: _bsddb.c Log Message: Add weakref support to all bsddb.db objects. Make DBTxn objects automatically call abort() in their destructor if not yet finalized and raise a RuntimeWarning to that effect. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** _bsddb.c 27 Jun 2004 23:36:37 -0000 1.33 --- _bsddb.c 28 Jun 2004 01:20:40 -0000 1.34 *************** *** 195,198 **** --- 195,205 ---- #endif + /* if Python >= 2.1 better support warnings */ + #if PYTHON_API_VERSION >= 1010 + #define HAVE_WARNINGS + #else + #undef HAVE_WARNINGS + #endif + struct behaviourFlags { /* What is the default behaviour when DB->get or DBCursor->get returns a *************** *** 213,216 **** --- 220,226 ---- int closed; struct behaviourFlags moduleFlags; + #ifdef HAVE_WEAKREF + PyObject *in_weakreflist; /* List of weak references */ + #endif } DBEnvObject; *************** *** 228,231 **** --- 238,244 ---- int primaryDBType; #endif + #ifdef HAVE_WEAKREF + PyObject *in_weakreflist; /* List of weak references */ + #endif } DBObject; *************** *** 244,247 **** --- 257,263 ---- PyObject_HEAD DB_TXN* txn; + #ifdef HAVE_WEAKREF + PyObject *in_weakreflist; /* List of weak references */ + #endif } DBTxnObject; *************** *** 250,253 **** --- 266,272 ---- PyObject_HEAD DB_LOCK lock; + #ifdef HAVE_WEAKREF + PyObject *in_weakreflist; /* List of weak references */ + #endif } DBLockObject; *************** *** 468,473 **** _db_errmsg[0] = 0; } ! /* if Python 2.1 or better use warning framework */ ! #if PYTHON_API_VERSION >= 1010 exceptionRaised = PyErr_Warn(PyExc_RuntimeWarning, errTxt); #else --- 487,491 ---- _db_errmsg[0] = 0; } ! #ifdef HAVE_WARNINGS exceptionRaised = PyErr_Warn(PyExc_RuntimeWarning, errTxt); #else *************** *** 698,701 **** --- 716,722 ---- self->primaryDBType = 0; #endif + #ifdef HAVE_WEAKREF + self->in_weakreflist = NULL; + #endif /* keep a reference to our python DBEnv object */ *************** *** 719,722 **** --- 740,746 ---- #endif MYDB_END_ALLOW_THREADS; + /* TODO add a weakref(self) to the self->myenvobj->open_child_weakrefs + * list so that a DBEnv can refuse to close without aborting any open + * open DBTxns and closing any open DBs first. */ if (makeDBError(err)) { if (self->myenvobj) { *************** *** 742,747 **** self->db->close(self->db, 0); MYDB_END_ALLOW_THREADS; ! /* if Python 2.1 or better use warning framework */ ! #if PYTHON_API_VERSION >= 1010 } else { PyErr_Warn(PyExc_RuntimeWarning, --- 766,770 ---- self->db->close(self->db, 0); MYDB_END_ALLOW_THREADS; ! #ifdef HAVE_WARNINGS } else { PyErr_Warn(PyExc_RuntimeWarning, *************** *** 751,754 **** --- 774,782 ---- self->db = NULL; } + #ifdef HAVE_WEAKREF + if (self->in_weakreflist != NULL) { + PyObject_ClearWeakRefs((PyObject *) self); + } + #endif if (self->myenvobj) { Py_DECREF(self->myenvobj); *************** *** 843,846 **** --- 871,877 ---- self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE; self->moduleFlags.cursorSetReturnsNone = DEFAULT_CURSOR_SET_RETURNS_NONE; + #ifdef HAVE_WEAKREF + self->in_weakreflist = NULL; + #endif MYDB_BEGIN_ALLOW_THREADS; *************** *** 860,863 **** --- 891,900 ---- DBEnv_dealloc(DBEnvObject* self) { + #ifdef HAVE_WEAKREF + if (self->in_weakreflist != NULL) { + PyObject_ClearWeakRefs((PyObject *) self); + } + #endif + if (!self->closed) { MYDB_BEGIN_ALLOW_THREADS; *************** *** 886,889 **** --- 923,929 ---- if (self == NULL) return NULL; + #ifdef HAVE_WEAKREF + self->in_weakreflist = NULL; + #endif MYDB_BEGIN_ALLOW_THREADS; *************** *** 893,896 **** --- 933,939 ---- err = txn_begin(myenv->db_env, parent, &(self->txn), flags); #endif + /* TODO add a weakref(self) to the self->myenvobj->open_child_weakrefs + * list so that a DBEnv can refuse to close without aborting any open + * open DBTxns and closing any open DBs first. */ MYDB_END_ALLOW_THREADS; if (makeDBError(err)) { *************** *** 904,910 **** DBTxn_dealloc(DBTxnObject* self) { ! /* XXX nothing to do for transaction objects?!? */ ! /* TODO: if it hasn't been commited, should we abort it? */ #if PYTHON_API_VERSION <= 1007 --- 947,970 ---- DBTxn_dealloc(DBTxnObject* self) { ! #ifdef HAVE_WEAKREF ! if (self->in_weakreflist != NULL) { ! PyObject_ClearWeakRefs((PyObject *) self); ! } ! #endif ! #ifdef HAVE_WARNINGS ! if (self->txn) { ! /* it hasn't been finalized, abort it! */ ! MYDB_BEGIN_ALLOW_THREADS; ! #if (DBVER >= 40) ! self->txn->abort(self->txn); ! #else ! txn_abort(self->txn); ! #endif ! MYDB_END_ALLOW_THREADS; ! PyErr_Warn(PyExc_RuntimeWarning, ! "DBTxn aborted in destructor. No prior commit() or abort()."); ! } ! #endif #if PYTHON_API_VERSION <= 1007 *************** *** 930,933 **** --- 990,996 ---- if (self == NULL) return NULL; + #ifdef HAVE_WEAKREF + self->in_weakreflist = NULL; + #endif MYDB_BEGIN_ALLOW_THREADS; *************** *** 950,954 **** DBLock_dealloc(DBLockObject* self) { ! /* TODO: if it hasn't been released, should we do it? */ #if PYTHON_API_VERSION <= 1007 --- 1013,1022 ---- DBLock_dealloc(DBLockObject* self) { ! #ifdef HAVE_WEAKREF ! if (self->in_weakreflist != NULL) { ! PyObject_ClearWeakRefs((PyObject *) self); ! } ! #endif ! /* TODO: is this lock held? should we release it? */ #if PYTHON_API_VERSION <= 1007 *************** *** 4306,4309 **** --- 4374,4390 ---- &DB_mapping,/*tp_as_mapping*/ 0, /*tp_hash*/ + #ifdef HAVE_WEAKREF + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(DBObject, in_weakreflist), /* tp_weaklistoffset */ + #endif }; *************** *** 4359,4362 **** --- 4440,4456 ---- 0, /*tp_as_mapping*/ 0, /*tp_hash*/ + #ifdef HAVE_WEAKREF + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(DBEnvObject, in_weakreflist), /* tp_weaklistoffset */ + #endif }; *************** *** 4378,4381 **** --- 4472,4488 ---- 0, /*tp_as_mapping*/ 0, /*tp_hash*/ + #ifdef HAVE_WEAKREF + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(DBTxnObject, in_weakreflist), /* tp_weaklistoffset */ + #endif }; *************** *** 4398,4401 **** --- 4505,4521 ---- 0, /*tp_as_mapping*/ 0, /*tp_hash*/ + #ifdef HAVE_WEAKREF + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(DBLockObject, in_weakreflist), /* tp_weaklistoffset */ + #endif };

1 0

python/dist/src/Doc/lib libsocket.tex,1.83,1.84
by bwarsaw＠users.sourceforge.net June 28, 2004

June 28, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13892/Doc/lib Modified Files: libsocket.tex Log Message: Added socket.getservbyport(), and make its second argument and that of getservbyname() optional. Update the tests and the docs. Index: libsocket.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsocket.tex,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** libsocket.tex 3 Jun 2004 16:23:23 -0000 1.83 --- libsocket.tex 28 Jun 2004 00:50:35 -0000 1.84 *************** *** 273,280 **** \end{funcdesc} ! \begin{funcdesc}{getservbyname}{servicename, protocolname} Translate an Internet service name and protocol name to a port number ! for that service. The protocol name should be \code{'tcp'} or ! \code{'udp'}. \end{funcdesc} --- 273,286 ---- \end{funcdesc} ! \begin{funcdesc}{getservbyname}{servicename\optional{, protocolname}} Translate an Internet service name and protocol name to a port number ! for that service. The optional protocol name, if given, should be ! \code{'tcp'} or \code{'udp'}, otherwise any protocol will match. ! \end{funcdesc} ! ! \begin{funcdesc}{getservbyport}{port\optional{, protocolname}} ! Translate an Internet port number and protocol name to a service name ! for that service. The optional protocol name, if given, should be ! \code{'tcp'} or \code{'udp'}, otherwise any protocol will match. \end{funcdesc}

1 0