Mailman 3 June 2004 - Python-checkins

python/dist/src/Misc NEWS,1.1011,1.1012
by bwarsaw＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13892/Misc Modified Files: NEWS Log Message: Added socket.getservbyport(), and make its second argument and that of getservbyname() optional. Update the tests and the docs. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1011 retrieving revision 1.1012 diff -C2 -d -r1.1011 -r1.1012 *** NEWS 27 Jun 2004 16:51:46 -0000 1.1011 --- NEWS 28 Jun 2004 00:50:42 -0000 1.1012 *************** *** 232,235 **** --- 232,238 ---- ----------------- + - Added socket.getservbyport(), and make the second argument in + getservbyname() and getservbyport() optional. + - time module code that deals with input POSIX timestamps will now raise ValueError if more than a second is lost in precision when the

1 0

python/dist/src/Modules socketmodule.c, 1.291, 1.292
by bwarsaw＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13892/Modules Modified Files: socketmodule.c Log Message: Added socket.getservbyport(), and make its second argument and that of getservbyname() optional. Update the tests and the docs. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.291 retrieving revision 1.292 diff -C2 -d -r1.291 -r1.292 *** socketmodule.c 3 Jun 2004 09:24:42 -0000 1.291 --- socketmodule.c 28 Jun 2004 00:50:43 -0000 1.292 *************** *** 26,30 **** - socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com') - socket.getprotobyname(protocolname) --> protocol number ! - socket.getservbyname(servicename, protocolname) --> port number - socket.socket([family[, type [, proto]]]) --> new socket object - socket.ntohs(16 bit value) --> new int object --- 26,31 ---- - socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com') - socket.getprotobyname(protocolname) --> protocol number ! - socket.getservbyname(servicename[, protocolname]) --> port number ! - socket.getservbyport(portnumber[, protocolname]) --> service name - socket.socket([family[, type [, proto]]]) --> new socket object - socket.ntohs(16 bit value) --> new int object *************** *** 2885,2891 **** socket_getservbyname(PyObject *self, PyObject *args) { ! char *name, *proto; struct servent *sp; ! if (!PyArg_ParseTuple(args, "ss:getservbyname", &name, &proto)) return NULL; Py_BEGIN_ALLOW_THREADS --- 2886,2892 ---- socket_getservbyname(PyObject *self, PyObject *args) { ! char *name, *proto=NULL; struct servent *sp; ! if (!PyArg_ParseTuple(args, "s|s:getservbyname", &name, &proto)) return NULL; Py_BEGIN_ALLOW_THREADS *************** *** 2900,2908 **** PyDoc_STRVAR(getservbyname_doc, ! "getservbyname(servicename, protocolname) -> integer\n\ \n\ Return a port number from a service name and protocol name.\n\ ! The protocol name should be 'tcp' or 'udp'."); /* Python interface to getprotobyname(name). --- 2901,2940 ---- PyDoc_STRVAR(getservbyname_doc, ! "getservbyname(servicename[, protocolname]) -> integer\n\ \n\ Return a port number from a service name and protocol name.\n\ ! The optional protocol name, if given, should be 'tcp' or 'udp',\n\ ! otherwise any protocol will match."); ! ! ! /* Python interface to getservbyport(port). ! This only returns the service name, since the other info is already ! known or not useful (like the list of aliases). */ ! ! /*ARGSUSED*/ ! static PyObject * ! socket_getservbyport(PyObject *self, PyObject *args) ! { ! int port; ! char *proto=NULL; ! struct servent *sp; ! if (!PyArg_ParseTuple(args, "i|s:getservbyport", &port, &proto)) ! return NULL; ! Py_BEGIN_ALLOW_THREADS ! sp = getservbyport(htons(port), proto); ! Py_END_ALLOW_THREADS ! if (sp == NULL) { ! PyErr_SetString(socket_error, "port/proto not found"); ! return NULL; ! } ! return PyString_FromString(sp->s_name); ! } + PyDoc_STRVAR(getservbyport_doc, + "getservbyport(port[, protocolname]) -> string\n\ + \n\ + Return the service name from a port number and protocol name.\n\ + The optional protocol name, if given, should be 'tcp' or 'udp',\n\ + otherwise any protocol will match."); /* Python interface to getprotobyname(name). *************** *** 3531,3534 **** --- 3563,3568 ---- {"getservbyname", socket_getservbyname, METH_VARARGS, getservbyname_doc}, + {"getservbyport", socket_getservbyport, + METH_VARARGS, getservbyport_doc}, {"getprotobyname", socket_getprotobyname, METH_VARARGS,getprotobyname_doc},

1 0

python/dist/src/Lib/test test_socket.py, 1.69, 1.70
by bwarsaw＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13892/Lib/test Modified Files: test_socket.py Log Message: Added socket.getservbyport(), and make its second argument and that of getservbyname() optional. Update the tests and the docs. Index: test_socket.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** test_socket.py 31 May 2004 03:09:25 -0000 1.69 --- test_socket.py 28 Jun 2004 00:50:37 -0000 1.70 *************** *** 285,299 **** self.assertRaises(OverflowError, func, 1L<<34) ! def testGetServByName(self): ! # Testing getservbyname() ! # try a few protocols - not everyone has telnet enabled ! for proto in ("telnet", "ssh", "www", "ftp"): ! try: ! socket.getservbyname(proto, 'tcp') ! break ! except socket.error: ! pass try: ! socket.getservbyname(proto, 'udp') break except socket.error: --- 285,296 ---- self.assertRaises(OverflowError, func, 1L<<34) ! def testGetServBy(self): ! eq = self.assertEqual ! # Find one service that exists, then check all the related interfaces. ! # I've ordered this by protocols that have both a tcp and udp ! # protocol, at least for modern Linuxes. ! for service in ('ssh', 'www', 'echo', 'imap2'): try: ! port = socket.getservbyname(service, 'tcp') break except socket.error: *************** *** 301,304 **** --- 298,316 ---- else: raise socket.error + # Try same call with optional protocol omitted + port2 = socket.getservbyname(service) + eq(port, port2) + # Try udp, but don't barf it it doesn't exist + try: + udpport = socket.getservbyname(service, 'udp') + except socket.error: + udpport = None + else: + eq(udpport, port) + # Now make sure the lookup by port returns the same service name + eq(socket.getservbyport(port2), service) + eq(socket.getservbyport(port, 'tcp'), service) + if udpport is not None: + eq(socket.getservbyport(udpport, 'udp'), service) def testDefaultTimeout(self):

1 0

python/dist/src/Include datetime.h,1.5,1.6
by bcannon＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13454/Include Modified Files: datetime.h Log Message: Add missing backslash for PyDateTimeAPI->Delta_FromDelta() macro. Index: datetime.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/datetime.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** datetime.h 20 Jun 2004 22:41:24 -0000 1.5 --- datetime.h 28 Jun 2004 00:48:30 -0000 1.6 *************** *** 226,230 **** #define PyDelta_FromDSU(days, seconds, useconds) \ ! PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, PyDateTimeAPI->DeltaType) --- 226,230 ---- #define PyDelta_FromDSU(days, seconds, useconds) \ ! PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ PyDateTimeAPI->DeltaType)

1 0

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

June 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1285/Modules Modified Files: _bsddb.c Log Message: raise the module minor version. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** _bsddb.c 27 Jun 2004 23:32:33 -0000 1.32 --- _bsddb.c 27 Jun 2004 23:36:37 -0000 1.33 *************** *** 98,102 **** #endif ! #define PY_BSDDB_VERSION "4.2.6" static char *rcs_id = "$Id$"; --- 98,102 ---- #endif ! #define PY_BSDDB_VERSION "4.2.7" static char *rcs_id = "$Id$";

1 0

[Python-checkins] python/dist/src/Lib/bsddb/test test_recno.py, 1.7, 1.8
by greg＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/bsddb/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32305/Lib/bsddb/test Modified Files: test_recno.py Log Message: SF patch / bug #967763 Fix memory leaks revealed by valgrind and ensuing code inspection. In the existing test suite valgrind revealed two memory leaks (DB_get and DBC_set_range). Code inspection revealed that there were many other potential similar leaks (many on odd code error paths such as passing something other than a DBTxn object for a txn= parameter or in the face of an out of memory error). The most common case that would cause a leak was when using recno or queue format databases with integer keys, sometimes only with an exception exit. Index: test_recno.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_recno.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_recno.py 21 Sep 2003 00:08:14 -0000 1.7 --- test_recno.py 27 Jun 2004 23:32:34 -0000 1.8 *************** *** 134,137 **** --- 134,144 ---- print rec + # test that non-existant key lookups work (and that + # DBC_set_range doesn't have a memleak under valgrind) + rec = c.set_range(999999) + assert rec == None + if verbose: + print rec + c.close() d.close() *************** *** 178,181 **** --- 185,190 ---- source = os.path.join(os.path.dirname(sys.argv[0]), 'db_home/test_recno.txt') + if not os.path.isdir('db_home'): + os.mkdir('db_home') f = open(source, 'w') # create the file f.close()

1 0

python/dist/src/Modules _bsddb.c,1.31,1.32
by greg＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32305/Modules Modified Files: _bsddb.c Log Message: SF patch / bug #967763 Fix memory leaks revealed by valgrind and ensuing code inspection. In the existing test suite valgrind revealed two memory leaks (DB_get and DBC_set_range). Code inspection revealed that there were many other potential similar leaks (many on odd code error paths such as passing something other than a DBTxn object for a txn= parameter or in the face of an out of memory error). The most common case that would cause a leak was when using recno or queue format databases with integer keys, sometimes only with an exception exit. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** _bsddb.c 25 Mar 2004 02:16:22 -0000 1.31 --- _bsddb.c 27 Jun 2004 23:32:33 -0000 1.32 *************** *** 298,302 **** #define FREE_DBT(dbt) if ((dbt.flags & (DB_DBT_MALLOC|DB_DBT_REALLOC)) && \ ! dbt.data != NULL) { free(dbt.data); } --- 298,302 ---- #define FREE_DBT(dbt) if ((dbt.flags & (DB_DBT_MALLOC|DB_DBT_REALLOC)) && \ ! dbt.data != NULL) { free(dbt.data); dbt.data = NULL; } *************** *** 331,335 **** else if (!PyArg_Parse(obj, "s#", &dbt->data, &dbt->size)) { PyErr_SetString(PyExc_TypeError, ! "Key and Data values must be of type string or None."); return 0; } --- 331,335 ---- else if (!PyArg_Parse(obj, "s#", &dbt->data, &dbt->size)) { PyErr_SetString(PyExc_TypeError, ! "Data values must be of type string or None."); return 0; } *************** *** 341,345 **** what's been given, verifies that it's allowed, and then makes the DBT. ! Caller should call FREE_DBT(key) when done. */ static int make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags) --- 341,345 ---- what's been given, verifies that it's allowed, and then makes the DBT. ! Caller MUST call FREE_DBT(key) when done. */ static int make_key_dbt(DBObject* self, PyObject* keyobj, DBT* key, int* pflags) *************** *** 1299,1307 **** if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; ! if (-1 == _DB_delete(self, txn, &key, 0)) return NULL; FREE_DBT(key); --- 1299,1311 ---- if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) { ! FREE_DBT(key); return NULL; + } ! if (-1 == _DB_delete(self, txn, &key, 0)) { ! FREE_DBT(key); return NULL; + } FREE_DBT(key); *************** *** 1349,1354 **** if (!make_key_dbt(self, keyobj, &key, &flags)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; CLEAR_DBT(data); --- 1353,1360 ---- if (!make_key_dbt(self, keyobj, &key, &flags)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) { ! FREE_DBT(key); return NULL; + } CLEAR_DBT(data); *************** *** 1357,1362 **** data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; MYDB_BEGIN_ALLOW_THREADS; --- 1363,1370 ---- data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) { ! FREE_DBT(key); return NULL; + } MYDB_BEGIN_ALLOW_THREADS; *************** *** 1380,1386 **** else /* return just the data */ retval = PyString_FromStringAndSize((char*)data.data, data.size); - FREE_DBT(key); FREE_DBT(data); } RETURN_IF_ERR(); --- 1388,1394 ---- else /* return just the data */ retval = PyString_FromStringAndSize((char*)data.data, data.size); FREE_DBT(data); } + FREE_DBT(key); RETURN_IF_ERR(); *************** *** 1407,1412 **** if (!make_key_dbt(self, keyobj, &key, &flags)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; CLEAR_DBT(data); --- 1415,1422 ---- if (!make_key_dbt(self, keyobj, &key, &flags)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) { ! FREE_DBT(key); return NULL; + } CLEAR_DBT(data); *************** *** 1450,1457 **** if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data)) ! return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; flags |= DB_GET_BOTH; --- 1460,1469 ---- if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if ( !make_dbt(dataobj, &data) || ! !checkTxnObj(txnobj, &txn) ) ! { ! FREE_DBT(key); return NULL; + } flags |= DB_GET_BOTH; *************** *** 1720,1727 **** CHECK_DB_NOT_CLOSED(self); ! if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data)) return NULL; ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; if (-1 == _DB_put(self, txn, &key, &data, flags)) { --- 1732,1744 ---- CHECK_DB_NOT_CLOSED(self); ! if (!make_key_dbt(self, keyobj, &key, NULL)) ! return NULL; ! if ( !make_dbt(dataobj, &data) || ! !add_partial_dbt(&data, dlen, doff) || ! !checkTxnObj(txnobj, &txn) ) ! { ! FREE_DBT(key); ! return NULL; ! } if (-1 == _DB_put(self, txn, &key, &data, flags)) { *************** *** 2391,2396 **** if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) return NULL; /* This causes ENOMEM to be returned when the db has the key because --- 2408,2415 ---- if (!make_key_dbt(self, keyobj, &key, NULL)) return NULL; ! if (!checkTxnObj(txnobj, &txn)) { ! FREE_DBT(key); return NULL; + } /* This causes ENOMEM to be returned when the db has the key because *************** *** 2693,2704 **** if (keyobj && !make_key_dbt(self->mydb, keyobj, &key, NULL)) return NULL; ! if (dataobj && !make_dbt(dataobj, &data)) ! return NULL; ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; if (CHECK_DBFLAG(self->mydb, DB_THREAD)) { data.flags = DB_DBT_MALLOC; ! key.flags = DB_DBT_MALLOC; } --- 2712,2727 ---- 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; ! } } *************** *** 2707,2711 **** MYDB_END_ALLOW_THREADS; - if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) { Py_INCREF(Py_None); --- 2730,2733 ---- *************** *** 2732,2738 **** break; } - FREE_DBT(key); FREE_DBT(data); } return retval; } --- 2754,2760 ---- break; } FREE_DBT(data); } + FREE_DBT(key); return retval; } *************** *** 2811,2817 **** if (!make_key_dbt(self->mydb, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data)) return NULL; ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; MYDB_BEGIN_ALLOW_THREADS; --- 2833,2842 ---- if (!make_key_dbt(self->mydb, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data) || ! !add_partial_dbt(&data, dlen, doff) ) ! { ! FREE_DBT(key); return NULL; ! } MYDB_BEGIN_ALLOW_THREADS; *************** *** 2849,2854 **** data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; MYDB_BEGIN_ALLOW_THREADS; --- 2874,2881 ---- data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) { ! FREE_DBT(key); return NULL; + } MYDB_BEGIN_ALLOW_THREADS; *************** *** 2879,2885 **** break; } - FREE_DBT(key); FREE_DBT(data); } return retval; --- 2906,2912 ---- break; } FREE_DBT(data); } + FREE_DBT(key); return retval; *************** *** 2907,2917 **** CLEAR_DBT(data); if (CHECK_DBFLAG(self->mydb, DB_THREAD)) { /* Tell BerkeleyDB to malloc the return value (thread safe) */ ! data.flags = DB_DBT_MALLOC; ! key.flags = DB_DBT_MALLOC; } - if (!add_partial_dbt(&data, dlen, doff)) - return NULL; MYDB_BEGIN_ALLOW_THREADS; err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RANGE); --- 2934,2949 ---- CLEAR_DBT(data); + if (!add_partial_dbt(&data, dlen, doff)) { + FREE_DBT(key); + return NULL; + } if (CHECK_DBFLAG(self->mydb, DB_THREAD)) { /* Tell BerkeleyDB to malloc the return value (thread safe) */ ! data.flags |= DB_DBT_MALLOC; ! /* only BTREE databases will return anything in the key */ ! if (!(key.flags & DB_DBT_REALLOC) && _DB_get_type(self->mydb) == DB_BTREE) { ! key.flags |= DB_DBT_MALLOC; ! } } MYDB_BEGIN_ALLOW_THREADS; err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RANGE); *************** *** 2941,2955 **** break; } ! if (_DB_get_type(self->mydb) == DB_BTREE) { ! /* the only time a malloced key is returned is when we ! * call this on a BTree database because it performs ! * partial matching and needs to return the real key. ! * All others leave key untouched [where calling free() ! * on it would often segfault]. ! */ ! FREE_DBT(key); ! } FREE_DBT(data); } return retval; --- 2973,2984 ---- break; } ! FREE_DBT(key); FREE_DBT(data); } + /* 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); + } return retval; *************** *** 2967,2972 **** if (!make_key_dbt(self->mydb, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data)) return NULL; MYDB_BEGIN_ALLOW_THREADS; --- 2996,3003 ---- if (!make_key_dbt(self->mydb, keyobj, &key, NULL)) return NULL; ! if (!make_dbt(dataobj, &data)) { ! FREE_DBT(key); return NULL; + } MYDB_BEGIN_ALLOW_THREADS; *************** *** 3105,3110 **** data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) return NULL; MYDB_BEGIN_ALLOW_THREADS; --- 3136,3143 ---- data.flags = DB_DBT_MALLOC; } ! if (!add_partial_dbt(&data, dlen, doff)) { ! FREE_DBT(key); return NULL; + } MYDB_BEGIN_ALLOW_THREADS; *************** *** 3121,3127 **** retval = Py_BuildValue("s#s#", key.data, key.size, data.data, data.size); - FREE_DBT(key); FREE_DBT(data); } return retval; --- 3154,3160 ---- retval = Py_BuildValue("s#s#", key.data, key.size, data.data, data.size); FREE_DBT(data); } + FREE_DBT(key); return retval;

1 0

python/dist/src/Demo/classes Range.py,1.6,1.7
by bcannon＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Demo/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29971 Modified Files: Range.py Log Message: Add code for a range function that uses generators. Cleaned up existing code by abstracting code to parse arguments. Also removed any unneeded operations (such as calling 'int' on a division when using floor division also works). Fixed a bug where the values returned by OldStyleRange could be short by one value. Added more documentation. Testing code also has a basic sanity check. Index: Range.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Demo/classes/Range.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Range.py 12 Feb 2004 17:35:01 -0000 1.6 --- Range.py 27 Jun 2004 23:17:35 -0000 1.7 *************** *** 1,49 **** ! # Example of a generator: re-implement the built-in range function ! # without actually constructing the list of values. (It turns out ! # that the built-in function is about 20 times faster -- that's why ! # it's built-in. :-) ! # Wrapper function to emulate the complicated range() arguments ! def range(*a): ! if len(a) == 1: ! start, stop, step = 0, a[0], 1 ! elif len(a) == 2: ! start, stop = a ! step = 1 ! elif len(a) == 3: ! start, stop, step = a ! else: ! raise TypeError, 'range() needs 1-3 arguments' ! return Range(start, stop, step) ! # Class implementing a range object. ! # To the user the instances feel like immutable sequences ! # (and you can't concatenate or slice them) ! class Range: ! # initialization -- should be called only by range() above ! def __init__(self, start, stop, step): ! if step == 0: ! raise ValueError, 'range() called with zero step' ! self.start = start ! self.stop = stop ! self.step = step ! self.len = max(0, int((self.stop - self.start) / self.step)) - # implement repr(x) and is also used by print x def __repr__(self): return 'range(%r, %r, %r)' % (self.start, self.stop, self.step) - # implement len(x) def __len__(self): return self.len - # implement x[i] def __getitem__(self, i): ! if 0 <= i < self.len: return self.start + self.step * i else: --- 1,62 ---- ! """Example of a generator: re-implement the built-in range function ! without actually constructing the list of values. + OldStyleRange is coded in the way required to work in a 'for' loop before + iterators were introduced into the language; using __getitem__ and __len__ . ! """ ! def handleargs(arglist): ! """Take list of arguments and extract/create proper start, stop, and step ! values and return in a tuple""" ! try: ! if len(arglist) == 1: ! return 0, int(arglist[0]), 1 ! elif len(arglist) == 2: ! return int(arglist[0]), int(arglist[1]), 1 ! elif len(arglist) == 3: ! if arglist[2] == 0: ! raise ValueError("step argument must not be zero") ! return tuple(int(x) for x in arglist) ! else: ! raise TypeError("range() accepts 1-3 arguments, given", len(arglist)) ! except TypeError: ! raise TypeError("range() arguments must be numbers or strings " ! "representing numbers") ! def genrange(*a): ! """Function to implement 'range' as a generator""" ! start, stop, step = handleargs(a) ! value = start ! while value < stop: ! yield value ! value += step + class oldrange: + """Class implementing a range object. + To the user the instances feel like immutable sequences + (and you can't concatenate or slice them) ! Done using the old way (pre-iterators; __len__ and __getitem__) to have an ! object be used by a 'for' loop. ! """ ! def __init__(self, *a): ! """ Initialize start, stop, and step values along with calculating the ! nubmer of values (what __len__ will return) in the range""" ! self.start, self.stop, self.step = handleargs(a) ! self.len = max(0, (self.stop - self.start) // self.step) def __repr__(self): + """implement repr(x) which is also used by print""" return 'range(%r, %r, %r)' % (self.start, self.stop, self.step) def __len__(self): + """implement len(x)""" return self.len def __getitem__(self, i): ! """implement x[i]""" ! if 0 <= i <= self.len: return self.start + self.step * i else: *************** *** 51,71 **** - # Small test program - def test(): import time, __builtin__ ! print range(10), range(-10, 10), range(0, 10, 2) ! for i in range(100, -100, -10): print i, ! print t1 = time.time() ! for i in range(1000): pass t2 = time.time() ! for i in __builtin__.range(1000): pass t3 = time.time() ! print t2-t1, 'sec (class)' ! print t3-t2, 'sec (built-in)' ! test() --- 64,93 ---- def test(): import time, __builtin__ ! #Just a quick sanity check ! correct_result = __builtin__.range(5, 100, 3) ! oldrange_result = list(oldrange(5, 100, 3)) ! genrange_result = list(genrange(5, 100, 3)) ! if genrange_result != correct_result or oldrange_result != correct_result: ! raise Exception("error in implementation:\ncorrect = %s" ! "\nold-style = %s\ngenerator = %s" % ! (correct_result, oldrange_result, genrange_result)) ! print "Timings for range(1000):" t1 = time.time() ! for i in oldrange(1000): pass t2 = time.time() ! for i in genrange(1000): pass t3 = time.time() ! for i in __builtin__.range(1000): ! pass ! t4 = time.time() ! print t2-t1, 'sec (old-style class)' ! print t3-t2, 'sec (generator)' ! print t4-t3, 'sec (built-in)' ! if __name__ == '__main__': ! test()

1 0

python/dist/src/Lib/bsddb __init__.py,1.14,1.15
by greg＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26632/Lib/bsddb Modified Files: __init__.py Log Message: Fix SF bug # 897820 - we can no longer use the DB_TRUNCATE flag when opening the DB to implement legacy interface flag='n' support as BerkeleyDB 4.2.52 no longer allows it in transaction protected environments. Do the os.unlink ourselves. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** __init__.py 26 Feb 2004 10:07:12 -0000 1.14 --- __init__.py 27 Jun 2004 22:56:42 -0000 1.15 *************** *** 60,64 **** #---------------------------------------------------------------------- ! import sys # for backwards compatibility with python versions older than 2.3, the --- 60,64 ---- #---------------------------------------------------------------------- ! import sys, os # for backwards compatibility with python versions older than 2.3, the *************** *** 282,286 **** cachesize=None, lorder=None, hflags=0): ! flags = _checkflag(flag) e = _openDBEnv() d = db.DB(e) --- 282,286 ---- cachesize=None, lorder=None, hflags=0): ! flags = _checkflag(flag, file) e = _openDBEnv() d = db.DB(e) *************** *** 300,304 **** pgsize=None, lorder=None): ! flags = _checkflag(flag) e = _openDBEnv() d = db.DB(e) --- 300,304 ---- pgsize=None, lorder=None): ! flags = _checkflag(flag, file) e = _openDBEnv() d = db.DB(e) *************** *** 319,323 **** rlen=None, delim=None, source=None, pad=None): ! flags = _checkflag(flag) e = _openDBEnv() d = db.DB(e) --- 319,323 ---- rlen=None, delim=None, source=None, pad=None): ! flags = _checkflag(flag, file) e = _openDBEnv() d = db.DB(e) *************** *** 340,344 **** return e ! def _checkflag(flag): if flag == 'r': flags = db.DB_RDONLY --- 340,344 ---- return e ! def _checkflag(flag, file): if flag == 'r': flags = db.DB_RDONLY *************** *** 350,354 **** flags = db.DB_CREATE elif flag == 'n': ! flags = db.DB_CREATE | db.DB_TRUNCATE else: raise error, "flags should be one of 'r', 'w', 'c' or 'n'" --- 350,359 ---- flags = db.DB_CREATE elif flag == 'n': ! flags = db.DB_CREATE ! #flags = db.DB_CREATE | db.DB_TRUNCATE ! # we used db.DB_TRUNCATE flag for this before but BerkeleyDB ! # 4.2.52 changed to disallowed truncate with txn environments. ! if os.path.isfile(file): ! os.unlink(file) else: raise error, "flags should be one of 'r', 'w', 'c' or 'n'"

1 0

python/dist/src/Objects stringobject.c, 2.218, 2.219
by tim_one＠users.sourceforge.net June 27, 2004

June 27, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31535/Objects Modified Files: stringobject.c Log Message: sizeof(char) is 1, by definition, so get rid of that expression in places it's just noise. Index: stringobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v retrieving revision 2.218 retrieving revision 2.219 diff -C2 -d -r2.218 -r2.219 *** stringobject.c 8 Jun 2004 18:52:54 -0000 2.218 --- stringobject.c 27 Jun 2004 17:24:49 -0000 2.219 *************** *** 71,76 **** /* Inline PyObject_NewVar */ ! op = (PyStringObject *) ! PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); --- 71,75 ---- /* Inline PyObject_NewVar */ ! op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size); if (op == NULL) return PyErr_NoMemory(); *************** *** 127,132 **** /* Inline PyObject_NewVar */ ! op = (PyStringObject *) ! PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); --- 126,130 ---- /* Inline PyObject_NewVar */ ! op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size); if (op == NULL) return PyErr_NoMemory(); *************** *** 800,804 **** { register PyStringObject* op = (PyStringObject*) obj; ! size_t newsize = 2 + 4 * op->ob_size * sizeof(char); PyObject *v; if (newsize > INT_MAX) { --- 798,802 ---- { register PyStringObject* op = (PyStringObject*) obj; ! size_t newsize = 2 + 4 * op->ob_size; PyObject *v; if (newsize > INT_MAX) { *************** *** 912,917 **** size = a->ob_size + b->ob_size; /* Inline PyObject_NewVar */ ! op = (PyStringObject *) ! PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); --- 910,914 ---- size = a->ob_size + b->ob_size; /* Inline PyObject_NewVar */ ! op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size); if (op == NULL) return PyErr_NoMemory(); *************** *** 949,955 **** return (PyObject *)a; } ! nbytes = size * sizeof(char); ! if (nbytes / sizeof(char) != (size_t)size || ! nbytes + sizeof(PyStringObject) <= nbytes) { PyErr_SetString(PyExc_OverflowError, "repeated string is too long"); --- 946,951 ---- return (PyObject *)a; } ! nbytes = (size_t)size; ! if (nbytes + sizeof(PyStringObject) <= nbytes) { PyErr_SetString(PyExc_OverflowError, "repeated string is too long"); *************** *** 3496,3501 **** _Py_ForgetReference(v); *pv = (PyObject *) ! PyObject_REALLOC((char *)v, ! sizeof(PyStringObject) + newsize * sizeof(char)); if (*pv == NULL) { PyObject_Del(v); --- 3492,3496 ---- _Py_ForgetReference(v); *pv = (PyObject *) ! PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize); if (*pv == NULL) { PyObject_Del(v);

1 0