Mailman 3 August 2003 - Python-checkins

python/dist/src/Misc NEWS,1.831.4.18,1.831.4.19
by bcannon＠users.sourceforge.net Aug. 29, 2003

Aug. 29, 2003

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv13077/Misc Modified Files: Tag: release23-maint NEWS Log Message: _strptime.srptime() escaped parentheses in the format string properly. Closes bug #796149 . Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.18 retrieving revision 1.831.4.19 diff -C2 -d -r1.831.4.18 -r1.831.4.19 *** NEWS 27 Aug 2003 05:08:19 -0000 1.831.4.18 --- NEWS 29 Aug 2003 02:34:22 -0000 1.831.4.19 *************** *** 31,34 **** --- 31,37 ---- ------- + - Bug #796149: time.strptime() now handles having parentheses in the + format string properly. + - The email package handles some RFC 2231 parameters with missing CHARSET fields better.

1 0

python/dist/src/Lib/test test_strptime.py, 1.19.4.3, 1.19.4.4
by bcannon＠users.sourceforge.net Aug. 29, 2003

Aug. 29, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv13077/Lib/test Modified Files: Tag: release23-maint test_strptime.py Log Message: _strptime.srptime() escaped parentheses in the format string properly. Closes bug #796149 . Index: test_strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v retrieving revision 1.19.4.3 retrieving revision 1.19.4.4 diff -C2 -d -r1.19.4.3 -r1.19.4.4 *** test_strptime.py 11 Aug 2003 07:19:06 -0000 1.19.4.3 --- test_strptime.py 29 Aug 2003 02:34:22 -0000 1.19.4.4 *************** *** 384,387 **** --- 384,396 ---- " %s != %s" % (strp_output, defaults)) + def test_escaping(self): + # Make sure all characters that have regex significance are escaped. + # Parentheses are in a purposeful order; will cause an error of + # unbalanced parentheses when the regex is compiled if they are not + # escaped. + # Test instigated by bug #796149 . + need_escaping = ".^$*+?{}\[]|)(" + self.failUnless(_strptime.strptime(need_escaping, need_escaping)) + class Strptime12AMPMTests(unittest.TestCase): """Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""

1 0

python/dist/src/Lib _strptime.py, 1.23.4.3, 1.23.4.4
by bcannon＠users.sourceforge.net Aug. 29, 2003

Aug. 29, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv13077/Lib Modified Files: Tag: release23-maint _strptime.py Log Message: _strptime.srptime() escaped parentheses in the format string properly. Closes bug #796149 . Index: _strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v retrieving revision 1.23.4.3 retrieving revision 1.23.4.4 diff -C2 -d -r1.23.4.3 -r1.23.4.4 *** _strptime.py 11 Aug 2003 07:19:05 -0000 1.23.4.3 --- _strptime.py 29 Aug 2003 02:34:22 -0000 1.23.4.4 *************** *** 382,386 **** # The sub() call escapes all characters that might be misconstrued # as regex syntax. ! regex_chars = re_compile(r"([\\.^$*+?{}\[\]|])") format = regex_chars.sub(r"\\\1", format) whitespace_replacement = re_compile('\s+') --- 382,386 ---- # The sub() call escapes all characters that might be misconstrued # as regex syntax. ! regex_chars = re_compile(r"([\\.^$*+?i{}\[\]|])") format = regex_chars.sub(r"\\\1", format) whitespace_replacement = re_compile('\s+')

1 0

python/dist/src/Lib _strptime.py,1.26,1.27
by bcannon＠users.sourceforge.net Aug. 29, 2003

Aug. 29, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv12267/Lib Modified Files: _strptime.py Log Message: Make sure parentheses are escaped when used in the format string. Closes bug #796149 . Will be backported. Index: _strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** _strptime.py 11 Aug 2003 07:24:05 -0000 1.26 --- _strptime.py 29 Aug 2003 02:28:53 -0000 1.27 *************** *** 250,254 **** # The sub() call escapes all characters that might be misconstrued # as regex syntax. ! regex_chars = re_compile(r"([\\.^$*+?{}\[\]|])") format = regex_chars.sub(r"\\\1", format) whitespace_replacement = re_compile('\s+') --- 250,254 ---- # The sub() call escapes all characters that might be misconstrued # as regex syntax. ! regex_chars = re_compile(r"([\\.^$*+?{}\[\]|])") format = regex_chars.sub(r"\\\1", format) whitespace_replacement = re_compile('\s+')

1 0

python/dist/src/Lib/test test_strptime.py, 1.22, 1.23
by bcannon＠users.sourceforge.net Aug. 29, 2003

Aug. 29, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv12267/Lib/test Modified Files: test_strptime.py Log Message: Make sure parentheses are escaped when used in the format string. Closes bug #796149 . Will be backported. Index: test_strptime.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** test_strptime.py 11 Aug 2003 19:06:13 -0000 1.22 --- test_strptime.py 29 Aug 2003 02:28:54 -0000 1.23 *************** *** 334,337 **** --- 334,346 ---- " %s != %s" % (strp_output, defaults)) + def test_escaping(self): + # Make sure all characters that have regex significance are escaped. + # Parentheses are in a purposeful order; will cause an error of + # unbalanced parentheses when the regex is compiled if they are not + # escaped. + # Test instigated by bug #796149 . + need_escaping = ".^$*+?{}\[]|)(" + self.failUnless(_strptime.strptime(need_escaping, need_escaping)) + class Strptime12AMPMTests(unittest.TestCase): """Test a _strptime regression in '%I %p' at 12 noon (12 PM)"""

1 0

python/dist/src/Lib/bsddb dbobj.py,1.7,1.8
by greg＠users.sourceforge.net Aug. 28, 2003

Aug. 28, 2003

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv353/bsddb Modified Files: dbobj.py Log Message: Support DBEnv.set_shm_key() to allow multi-threaded multi-process database environments to use shared memory on systems supporting it. Index: dbobj.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbobj.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dbobj.py 9 Jul 2003 04:45:59 -0000 1.7 --- dbobj.py 28 Aug 2003 21:50:30 -0000 1.8 *************** *** 40,43 **** --- 40,45 ---- def remove(self, *args, **kwargs): return apply(self._cobj.remove, args, kwargs) + def set_shm_key(self, *args, **kwargs): + return apply(self._cobj.set_shm_key, args, kwargs) def set_cachesize(self, *args, **kwargs): return apply(self._cobj.set_cachesize, args, kwargs)

1 0

python/dist/src/Modules _bsddb.c,1.17,1.18
by greg＠users.sourceforge.net Aug. 28, 2003

Aug. 28, 2003

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv353/extsrc Modified Files: _bsddb.c Log Message: Support DBEnv.set_shm_key() to allow multi-threaded multi-process database environments to use shared memory on systems supporting it. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** _bsddb.c 15 Jul 2003 19:12:54 -0000 1.17 --- _bsddb.c 28 Aug 2003 21:50:30 -0000 1.18 *************** *** 3278,3281 **** --- 3278,3296 ---- static PyObject* + DBEnv_set_shm_key(DBEnvObject* self, PyObject* args) + { + int err; + long shm_key = 0; + + if (!PyArg_ParseTuple(args, "l:set_shm_key", &shm_key)) + return NULL; + CHECK_ENV_NOT_CLOSED(self); + + err = self->db_env->set_shm_key(self->db_env, shm_key); + RETURN_IF_ERR(); + RETURN_NONE(); + } + + static PyObject* DBEnv_set_cachesize(DBEnvObject* self, PyObject* args) { *************** *** 4077,4080 **** --- 4092,4096 ---- {"set_timeout", (PyCFunction)DBEnv_set_timeout, METH_VARARGS|METH_KEYWORDS}, #endif + {"set_shm_key", (PyCFunction)DBEnv_set_shm_key, METH_VARARGS}, {"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS}, {"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS},

1 0

python/dist/src/Python compile.c,2.291,2.292
by jhylton＠users.sourceforge.net Aug. 28, 2003

Aug. 28, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv11600 Modified Files: compile.c Log Message: Fix for SF bug [ 784075 ] Fatal Python error: unknown scope Make sure the inner function is not compiled when there is a syntax error in the default arguments. Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.291 retrieving revision 2.292 diff -C2 -d -r2.291 -r2.292 *** compile.c 15 Jul 2003 20:23:26 -0000 2.291 --- compile.c 28 Aug 2003 14:42:14 -0000 2.292 *************** *** 3667,3674 **** } static int com_argdefs(struct compiling *c, node *n) { ! int i, nch, nargs, ndefs; if (TYPE(n) == lambdef) { /* lambdef: 'lambda' [varargslist] ':' test */ --- 3667,3680 ---- } + /* Return the number of default values in the argument list. + + If a non-default argument follows a default argument, set an + exception and return -1. + */ + static int com_argdefs(struct compiling *c, node *n) { ! int i, nch, ndefs; if (TYPE(n) == lambdef) { /* lambdef: 'lambda' [varargslist] ':' test */ *************** *** 3687,3691 **** fpdef ['=' test] (',' fpdef ['=' test])* [','] */ nch = NCH(n); - nargs = 0; ndefs = 0; for (i = 0; i < nch; i++) { --- 3693,3696 ---- *************** *** 3694,3698 **** TYPE(CHILD(n, i)) == DOUBLESTAR) break; - nargs++; i++; if (i >= nch) --- 3699,3702 ---- *************** *** 3711,3717 **** else { /* Treat "(a=1, b)" as an error */ ! if (ndefs) com_error(c, PyExc_SyntaxError, "non-default argument follows default argument"); } if (t != COMMA) --- 3715,3723 ---- else { /* Treat "(a=1, b)" as an error */ ! if (ndefs) { com_error(c, PyExc_SyntaxError, "non-default argument follows default argument"); + return -1; + } } if (t != COMMA) *************** *** 3728,3731 **** --- 3734,3739 ---- REQ(n, funcdef); /* funcdef: 'def' NAME parameters ':' suite */ ndefs = com_argdefs(c, n); + if (ndefs < 0) + return; symtable_enter_scope(c->c_symtable, STR(CHILD(n, 1)), TYPE(n), n->n_lineno);

1 0

python/dist/src/Lib/compiler symbols.py, 1.12, 1.13
by jhylton＠users.sourceforge.net Aug. 28, 2003

Aug. 28, 2003

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1:/tmp/cvs-serv31985 Modified Files: symbols.py Log Message: Fix SF bug [ 788011 ] compiler.compileFile fails on csv.py Bug fix candidate. Index: symbols.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/symbols.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** symbols.py 31 Dec 2002 18:17:42 -0000 1.12 --- symbols.py 28 Aug 2003 02:09:26 -0000 1.13 *************** *** 221,225 **** self.handle_free_vars(scope, parent) ! def visitLambda(self, node, parent): for n in node.defaults: self.visit(n, parent) --- 221,230 ---- self.handle_free_vars(scope, parent) ! def visitLambda(self, node, parent, assign=0): ! # Lambda is an expression, so it could appear in an expression ! # context where assign is passed. The transformer should catch ! # any code that has a lambda on the left-hand side. ! assert not assign ! for n in node.defaults: self.visit(n, parent)

1 0

python/dist/src/Lib compileall.py,1.14,1.14.12.1
by theller＠users.sourceforge.net Aug. 27, 2003

Aug. 27, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv28517 Modified Files: Tag: release23-maint compileall.py Log Message: Fix typo in docstring: The switch is '-x', not '-s'. Index: compileall.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compileall.py,v retrieving revision 1.14 retrieving revision 1.14.12.1 diff -C2 -d -r1.14 -r1.14.12.1 *** compileall.py 16 Jan 2003 11:02:43 -0000 1.14 --- compileall.py 27 Aug 2003 20:21:06 -0000 1.14.12.1 *************** *** 111,115 **** print msg print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \ ! "[-s regexp] [directory ...]" print "-l: don't recurse down" print "-f: force rebuild even if timestamps are up-to-date" --- 111,115 ---- print msg print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \ ! "[-x regexp] [directory ...]" print "-l: don't recurse down" print "-f: force rebuild even if timestamps are up-to-date"

1 0