Mailman 3 June 2005 - Python-checkins

python/dist/src configure, 1.471, 1.472 configure.in, 1.484, 1.485 pyconfig.h.in, 1.106, 1.107
by perky＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19602 Modified Files: configure configure.in pyconfig.h.in Log Message: Patch #1212117: Add optional attribute st_flags to os.stat_result when the member is available on the platform. (Contributed by Diego Petteno) Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.471 retrieving revision 1.472 diff -u -d -r1.471 -r1.472 --- configure 28 Mar 2005 23:23:46 -0000 1.471 +++ configure 2 Jun 2005 13:08:55 -0000 1.472 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.483 . +# From configure.in Revision: 1.484 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -16414,6 +16414,116 @@ fi +echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5 +echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static struct stat ac_aggr; +if (ac_aggr.st_flags) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_stat_st_flags=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static struct stat ac_aggr; +if (sizeof ac_aggr.st_flags) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_stat_st_flags=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_stat_st_flags=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_flags" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6 +if test $ac_cv_member_struct_stat_st_flags = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_FLAGS 1 +_ACEOF + + +fi + echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.484 retrieving revision 1.485 diff -u -d -r1.484 -r1.485 --- configure.in 28 Mar 2005 23:23:47 -0000 1.484 +++ configure.in 2 Jun 2005 13:09:24 -0000 1.485 @@ -2421,6 +2421,7 @@ AC_STRUCT_TIMEZONE AC_CHECK_MEMBERS([struct stat.st_rdev]) AC_CHECK_MEMBERS([struct stat.st_blksize]) +AC_CHECK_MEMBERS([struct stat.st_flags]) AC_STRUCT_ST_BLOCKS AC_MSG_CHECKING(for time.h that defines altzone) Index: pyconfig.h.in =================================================================== RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- pyconfig.h.in 23 Jan 2005 09:27:22 -0000 1.106 +++ pyconfig.h.in 2 Jun 2005 13:09:25 -0000 1.107 @@ -489,6 +489,9 @@ /* Define to 1 if `st_blocks' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS +/* Define to 1 if `st_flags' is member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_FLAGS + /* Define to 1 if `st_rdev' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV

1 0

python/dist/src/Doc/lib libos.tex,1.154,1.155
by perky＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19602/Doc/lib Modified Files: libos.tex Log Message: Patch #1212117: Add optional attribute st_flags to os.stat_result when the member is available on the platform. (Contributed by Diego Petteno) Index: libos.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libos.tex,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- libos.tex 16 May 2005 02:42:21 -0000 1.154 +++ libos.tex 2 Jun 2005 13:09:30 -0000 1.155 @@ -966,6 +966,7 @@ \member{st_blocks} (number of blocks allocated for file), \member{st_blksize} (filesystem blocksize), \member{st_rdev} (type of device if an inode device). +\member{st_flags} (user defined flags for file). On Mac OS systems, the following attributes may also be available: \member{st_rsize},

1 0

python/dist/src/Modules posixmodule.c, 2.335, 2.336
by perky＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19602/Modules Modified Files: posixmodule.c Log Message: Patch #1212117: Add optional attribute st_flags to os.stat_result when the member is available on the platform. (Contributed by Diego Petteno) Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.335 retrieving revision 2.336 diff -u -d -r2.335 -r2.336 --- posixmodule.c 16 May 2005 02:42:21 -0000 2.335 +++ posixmodule.c 2 Jun 2005 13:09:28 -0000 2.336 @@ -674,8 +674,8 @@ (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\n\ or via the attributes st_mode, st_ino, st_dev, st_nlink, st_uid, and so on.\n\ \n\ -Posix/windows: If your platform supports st_blksize, st_blocks, or st_rdev,\n\ -they are available as attributes only.\n\ +Posix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\n\ +or st_flags, they are available as attributes only.\n\ \n\ See os.stat for more information."); @@ -703,6 +703,9 @@ #ifdef HAVE_STRUCT_STAT_ST_RDEV {"st_rdev", "device type (if inode device)"}, #endif +#ifdef HAVE_STRUCT_STAT_ST_FLAGS + {"st_flags", "user defined flags for file"}, +#endif {0} }; @@ -724,6 +727,12 @@ #define ST_RDEV_IDX ST_BLOCKS_IDX #endif +#ifdef HAVE_STRUCT_STAT_ST_FLAGS +#define ST_FLAGS_IDX (ST_RDEV_IDX+1) +#else +#define ST_FLAGS_IDX ST_RDEV_IDX +#endif + static PyStructSequence_Desc stat_result_desc = { "stat_result", /* name */ stat_result__doc__, /* doc */ @@ -887,6 +896,10 @@ PyStructSequence_SET_ITEM(v, ST_RDEV_IDX, PyInt_FromLong((long)st.st_rdev)); #endif +#ifdef HAVE_STRUCT_STAT_ST_FLAGS + PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX, + PyInt_FromLong((long)st.st_flags)); +#endif if (PyErr_Occurred()) { Py_DECREF(v);

1 0

Virus Alert
by antivirusadmin＠mediag8way.ph June 2, 2005

June 2, 2005

The mail message (file: Data.zip) you sent to pcclinic(a)pcworld.com.ph contains a virus. (on mail.mediag8way.ph)

1 0

python/dist/src/Lib/test test_compiler.py, 1.12, 1.13
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv367/Lib/test Modified Files: test_compiler.py Log Message: Fix compiler.ast.flatten function so that it works on lists. Index: test_compiler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compiler.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- test_compiler.py 20 Apr 2005 17:45:12 -0000 1.12 +++ test_compiler.py 2 Jun 2005 05:55:19 -0000 1.13 @@ -1,4 +1,5 @@ import compiler +from compiler.ast import flatten import os import test.test_support import unittest @@ -60,6 +61,10 @@ for child in node.getChildNodes(): self.check_lineno(child) + def testFlatten(self): + self.assertEquals(flatten([1, [2]]), [1, 2]) + self.assertEquals(flatten((1, (2,))), [1, 2]) + NOLINENO = (compiler.ast.Module, compiler.ast.Stmt, compiler.ast.Discard) ###############################################################################

1 0

python/dist/src/Tools/compiler astgen.py, 1.10, 1.11
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Tools/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv367/Tools/compiler Modified Files: astgen.py Log Message: Fix compiler.ast.flatten function so that it works on lists. Index: astgen.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/compiler/astgen.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- astgen.py 12 Sep 2004 03:49:31 -0000 1.10 +++ astgen.py 2 Jun 2005 05:55:20 -0000 1.11 @@ -234,9 +234,9 @@ """ from consts import CO_VARARGS, CO_VARKEYWORDS -def flatten(list): +def flatten(seq): l = [] - for elt in list: + for elt in seq: t = type(elt) if t is tuple or t is list: for elt2 in flatten(elt): @@ -245,8 +245,8 @@ l.append(elt) return l -def flatten_nodes(list): - return [n for n in flatten(list) if isinstance(n, Node)] +def flatten_nodes(seq): + return [n for n in flatten(seq) if isinstance(n, Node)] nodes = {}

1 0

python/dist/src/Lib/compiler ast.py,1.27,1.28
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv367/Lib/compiler Modified Files: ast.py Log Message: Fix compiler.ast.flatten function so that it works on lists. Index: ast.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/ast.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ast.py 12 Sep 2004 03:49:29 -0000 1.27 +++ ast.py 2 Jun 2005 05:55:18 -0000 1.28 @@ -4,9 +4,9 @@ """ from consts import CO_VARARGS, CO_VARKEYWORDS -def flatten(list): +def flatten(seq): l = [] - for elt in list: + for elt in seq: t = type(elt) if t is tuple or t is list: for elt2 in flatten(elt): @@ -15,8 +15,8 @@ l.append(elt) return l -def flatten_nodes(list): - return [n for n in flatten(list) if isinstance(n, Node)] +def flatten_nodes(seq): + return [n for n in flatten(seq) if isinstance(n, Node)] nodes = {}

1 0

python/dist/src/Python ast.c,1.1.2.62,1.1.2.63
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23165/Python Modified Files: Tag: ast-branch ast.c Log Message: Add invalid trailing comma syntax check for import statements. Closes SF patch #1194895. Index: ast.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/ast.c,v retrieving revision 1.1.2.62 retrieving revision 1.1.2.63 diff -u -d -r1.1.2.62 -r1.1.2.63 --- ast.c 28 Apr 2005 03:32:39 -0000 1.1.2.62 +++ ast.c 2 Jun 2005 05:34:35 -0000 1.1.2.63 @@ -2079,8 +2079,18 @@ /* XXX this needs to be cleaned up */ from_modules = STR(CHILD(n, 3)); - if (!from_modules || from_modules[0] == '*') + if (!from_modules) { n = CHILD(n, 3); /* from ... import x, y, z */ + if (NCH(n) % 2 == 0) { + /* it ends with a comma, not valid but the parser allows it */ + ast_error(n, "trailing comma not allowed without" + " surrounding parentheses"); + return NULL; + } + } + else if (from_modules[0] == '*') { + n = CHILD(n,3); /* from ... import * */ + } else if (from_modules[0] == '(') n = CHILD(n, 4); /* from ... import (x, y, z) */ else

1 0

python/dist/src/Lib/test/output test_grammar, 1.19.2.1, 1.19.2.2
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Lib/test/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/Lib/test/output Modified Files: Tag: ast-branch test_grammar Log Message: Use block type attribute from symbol table to catch 'return' and 'yield' syntax errors. Index: test_grammar =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_grammar,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -u -d -r1.19.2.1 -r1.19.2.2 --- test_grammar 7 Jan 2005 06:59:20 -0000 1.19.2.1 +++ test_grammar 2 Jun 2005 05:14:34 -0000 1.19.2.2 @@ -34,6 +34,7 @@ continue + try/finally ok testing continue and break in try/except in loop return_stmt +yield_stmt raise_stmt import_name import_from

1 0

python/dist/src/Python newcompile.c, 1.1.2.107, 1.1.2.108
by nascheme＠users.sourceforge.net June 2, 2005

June 2, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/Python Modified Files: Tag: ast-branch newcompile.c Log Message: Use block type attribute from symbol table to catch 'return' and 'yield' syntax errors. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.107 retrieving revision 1.1.2.108 diff -u -d -r1.1.2.107 -r1.1.2.108 --- newcompile.c 15 Apr 2005 01:49:23 -0000 1.1.2.107 +++ newcompile.c 2 Jun 2005 05:14:34 -0000 1.1.2.108 @@ -1992,8 +1992,8 @@ case ClassDef_kind: return compiler_class(c, s); case Return_kind: - if (c->c_nestlevel <= 1) - return compiler_error(c, "'return' outside function"); + if (c->u->u_ste->ste_type != FunctionBlock) + return compiler_error(c, "'return' outside function"); if (s->v.Return.value) { if (c->u->u_ste->ste_generator) { return compiler_error(c, @@ -2006,7 +2006,7 @@ ADDOP(c, RETURN_VALUE); break; case Yield_kind: - if (c->c_nestlevel <= 1) + if (c->u->u_ste->ste_type != FunctionBlock) return compiler_error(c, "'yield' outside function"); for (i = 0; i < c->u->u_nfblocks; i++) { if (c->u->u_fblock[i].fb_type == FINALLY_TRY)

1 0