Mailman 3 December 2003 - Python-checkins

python/dist/src/Lib/distutils emxccompiler.py, 1.10, 1.11
by aimacintyre＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv2895 Modified Files: emxccompiler.py Log Message: use same compiler switches as core for extensions Index: emxccompiler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/emxccompiler.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** emxccompiler.py 14 Nov 2002 02:25:41 -0000 1.10 --- emxccompiler.py 2 Dec 2003 12:17:59 -0000 1.11 *************** *** 64,69 **** # Hard-code GCC because that's what this is all about. # XXX optimization, warnings etc. should be customizable. ! self.set_executables(compiler='gcc -Zomf -Zmt -O2 -Wall', ! compiler_so='gcc -Zomf -Zmt -O2 -Wall', linker_exe='gcc -Zomf -Zmt -Zcrtdll', linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') --- 64,69 ---- # Hard-code GCC because that's what this is all about. # XXX optimization, warnings etc. should be customizable. ! self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', ! compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', linker_exe='gcc -Zomf -Zmt -Zcrtdll', linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')

1 0

python/dist/src/Lib keyword.py,1.12,1.13
by rhettinger＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv6662 Modified Files: keyword.py Log Message: SF patch #852140: keyword.py - use __contains__ and bool Use a set instead of dict with values equal to one. Index: keyword.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/keyword.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** keyword.py 30 Oct 2002 05:17:22 -0000 1.12 --- keyword.py 2 Dec 2003 07:48:15 -0000 1.13 *************** *** 47,55 **** ] ! kwdict = {} ! for keyword in kwlist: ! kwdict[keyword] = 1 ! ! iskeyword = kwdict.has_key def main(): --- 47,51 ---- ] ! iskeyword = frozenset(kwlist).__contains__ def main():

1 0

python/dist/src/Doc/tut tut.tex,1.212,1.213
by rhettinger＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Doc/tut In directory sc8-pr-cvs1:/tmp/cvs-serv5077 Modified Files: tut.tex Log Message: Convert a 0/1 to False/True. Index: tut.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tut/tut.tex,v retrieving revision 1.212 retrieving revision 1.213 diff -C2 -d -r1.212 -r1.213 *** tut.tex 26 Nov 2003 17:52:45 -0000 1.212 --- tut.tex 2 Dec 2003 07:38:30 -0000 1.213 *************** *** 1421,1426 **** while True: ok = raw_input(prompt) ! if ok in ('y', 'ye', 'yes'): return 1 ! if ok in ('n', 'no', 'nop', 'nope'): return 0 retries = retries - 1 if retries < 0: raise IOError, 'refusenik user' --- 1421,1426 ---- while True: ok = raw_input(prompt) ! if ok in ('y', 'ye', 'yes'): return True ! if ok in ('n', 'no', 'nop', 'nope'): return False retries = retries - 1 if retries < 0: raise IOError, 'refusenik user'

1 0

python/dist/src/Python symtable.c, 2.10.8.15, 2.10.8.16
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv472 Modified Files: Tag: ast-branch symtable.c Log Message: Set flags for CO_VARARGS and CO_VARKEYWORDS. Index: symtable.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/symtable.c,v retrieving revision 2.10.8.15 retrieving revision 2.10.8.16 diff -C2 -d -r2.10.8.15 -r2.10.8.16 *** symtable.c 1 Apr 2003 22:13:31 -0000 2.10.8.15 --- symtable.c 2 Dec 2003 07:04:51 -0000 2.10.8.16 *************** *** 888,895 **** if (a->args && !symtable_visit_params(st, a->args, 1)) return 0; ! if (a->vararg && !symtable_add_def(st, a->vararg, DEF_PARAM)) return 0; ! if (a->kwarg && !symtable_add_def(st, a->kwarg, DEF_PARAM)) return 0; return 1; } --- 888,901 ---- if (a->args && !symtable_visit_params(st, a->args, 1)) return 0; ! if (a->vararg) { ! if (!symtable_add_def(st, a->vararg, DEF_PARAM)) return 0; ! st->st_cur->ste_varargs = 1; ! } ! if (a->kwarg) { ! if (!symtable_add_def(st, a->kwarg, DEF_PARAM)) return 0; + st->st_cur->ste_varkeywords = 1; + } return 1; }

1 0

python/dist/src/Python newcompile.c, 1.1.2.56, 1.1.2.57
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv32465 Modified Files: Tag: ast-branch newcompile.c Log Message: Off-by-one in assertion. Thread CO_ flags through from symbol table. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.56 retrieving revision 1.1.2.57 diff -C2 -d -r1.1.2.56 -r1.1.2.57 *** newcompile.c 2 Dec 2003 05:53:43 -0000 1.1.2.56 --- newcompile.c 2 Dec 2003 07:01:20 -0000 1.1.2.57 *************** *** 2207,2211 **** a->a_lnotab_off += ncodes * 2; } ! assert(d_bytecode < 255); if (d_lineno > 255) { int i, nbytes, ncodes = d_lineno / 255; --- 2207,2211 ---- a->a_lnotab_off += ncodes * 2; } ! assert(d_bytecode <= 255); if (d_lineno > 255) { int i, nbytes, ncodes = d_lineno / 255; *************** *** 2368,2371 **** --- 2368,2375 ---- flags |= CO_GENERATOR; } + if (ste->ste_varargs) + flags |= CO_VARARGS; + if (ste->ste_varkeywords) + flags |= CO_VARKEYWORDS; return flags; }

1 0

python/dist/src/Include symtable.h, 2.9.18.8, 2.9.18.9
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv32005 Modified Files: Tag: ast-branch symtable.h Log Message: Add flags for CO_VARARGS and CO_VARKEYWORDS. Index: symtable.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/symtable.h,v retrieving revision 2.9.18.8 retrieving revision 2.9.18.9 diff -C2 -d -r2.9.18.8 -r2.9.18.9 *** symtable.h 28 Apr 2003 17:32:47 -0000 2.9.18.8 --- symtable.h 2 Dec 2003 06:58:37 -0000 2.9.18.9 *************** *** 36,39 **** --- 36,41 ---- including free refs to globals */ int ste_generator : 1; /* true if namespace is a generator */ + int ste_varargs : 1; /* true if block has varargs */ + int ste_varkeywords : 1; /* true if block has varkeywords */ int ste_lineno; /* first line of block */ int ste_opt_lineno; /* lineno of last exec or import * */

1 0

python/dist/src/Python ast.c,1.1.2.35,1.1.2.36
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv31586 Modified Files: Tag: ast-branch ast.c Log Message: Probable fix for set_context(). It was complaining about types that don't have a context attribute, but I think it's expected to ignore these expression types. My memory is hazy. Change comparisons so -1 is second. No way. Index: ast.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/ast.c,v retrieving revision 1.1.2.35 retrieving revision 1.1.2.36 diff -C2 -d -r1.1.2.35 -r1.1.2.36 *** ast.c 2 Dec 2003 05:53:43 -0000 1.1.2.35 --- ast.c 2 Dec 2003 06:54:28 -0000 1.1.2.36 *************** *** 278,284 **** break; default: ! PyErr_Format(PyExc_SyntaxError, "can't set context for %d", ! e->kind); ! return -1; } if (s) { --- 278,286 ---- break; default: ! /* XXX It's not clear why were't getting into this code, ! although list comps seem like one possibility. ! */ ! fprintf(stderr, "can't set context for %d\n", e->kind); ! return 0; } if (s) { *************** *** 327,331 **** default: PyErr_Format(PyExc_Exception, "invalid augassign: %s", STR(n)); ! return NULL; } } --- 329,333 ---- default: PyErr_Format(PyExc_Exception, "invalid augassign: %s", STR(n)); ! return 0; } } *************** *** 362,366 **** PyErr_Format(PyExc_Exception, "invalid comp_op: %s", STR(n)); ! return NULL; } } --- 364,368 ---- PyErr_Format(PyExc_Exception, "invalid comp_op: %s", STR(n)); ! return 0; } } *************** *** 376,385 **** PyErr_Format(PyExc_Exception, "invalid comp_op: %s %s", STR(CHILD(n, 0)), STR(CHILD(n, 1))); ! return NULL; } } PyErr_Format(PyExc_Exception, "invalid comp_op: has %d children", NCH(n)); ! return NULL; } --- 378,387 ---- PyErr_Format(PyExc_Exception, "invalid comp_op: %s %s", STR(CHILD(n, 0)), STR(CHILD(n, 1))); ! return 0; } } PyErr_Format(PyExc_Exception, "invalid comp_op: has %d children", NCH(n)); ! return 0; } *************** *** 623,626 **** --- 625,630 ---- node *ch; + fprintf(stderr, "listcomp at %d\n", n->n_lineno); + REQ(n, listmaker); assert(NCH(n) > 1); *************** *** 630,638 **** return NULL; ! if (-1 == set_context(elt, Load)) return NULL; n_fors = count_list_fors(n); ! if (-1 == n_fors) return NULL; --- 634,644 ---- return NULL; ! if (set_context(elt, Load) == -1) { ! fprintf(stderr, "XXX 2\n"); return NULL; + } n_fors = count_list_fors(n); ! if (n_fors == -1) return NULL; *************** *** 678,682 **** ch = CHILD(ch, 4); n_ifs = count_list_ifs(ch); ! if (-1 == n_ifs) { asdl_seq_free(listcomps); return NULL; --- 684,688 ---- ch = CHILD(ch, 4); n_ifs = count_list_ifs(ch); ! if (n_ifs == -1) { asdl_seq_free(listcomps); return NULL; *************** *** 1295,1299 **** } tmp = set_context(e, Store); ! if (-1 == tmp) { asdl_seq_free(targets); return NULL; --- 1301,1305 ---- } tmp = set_context(e, Store); ! if (tmp == -1) { asdl_seq_free(targets); return NULL; *************** *** 1360,1364 **** if (context) { int context_result = set_context(e, context); ! if (-1 == context_result) return NULL; } --- 1366,1370 ---- if (context) { int context_result = set_context(e, context); ! if (context_result == -1) return NULL; } *************** *** 1971,1975 **** if (!e) return NULL; ! if (-1 == set_context(e, Store)) return NULL; expression = ast_for_expr(CHILD(exc, 1)); --- 1977,1981 ---- if (!e) return NULL; ! if (set_context(e, Store) == -1) return NULL; expression = ast_for_expr(CHILD(exc, 1));

1 0

python/dist/src/Lib site.py,1.53.6.1,1.53.6.2
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv30842 Modified Files: Tag: release23-maint site.py Log Message: A hack: Disable import of re, because sre doesn't compile right. DON'T MERGE THIS CHANGE TO THE TRUNK. Index: site.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v retrieving revision 1.53.6.1 retrieving revision 1.53.6.2 diff -C2 -d -r1.53.6.1 -r1.53.6.2 *** site.py 20 Oct 2003 14:34:46 -0000 1.53.6.1 --- site.py 2 Dec 2003 06:47:37 -0000 1.53.6.2 *************** *** 92,96 **** if (os.name == "posix" and sys.path and os.path.basename(sys.path[-1]) == "Modules"): ! from distutils.util import get_platform s = "build/lib.%s-%.3s" % (get_platform(), sys.version) s = os.path.join(os.path.dirname(sys.path[-1]), s) --- 92,98 ---- if (os.name == "posix" and sys.path and os.path.basename(sys.path[-1]) == "Modules"): ! ## from distutils.util import get_platform ! def get_platform(): ! return "linux-i686" s = "build/lib.%s-%.3s" % (get_platform(), sys.version) s = os.path.join(os.path.dirname(sys.path[-1]), s)

1 0

python/dist/src/Python ast.c, 1.1.2.34, 1.1.2.35 newcompile.c, 1.1.2.55, 1.1.2.56
by jhylton＠users.sourceforge.net Dec. 2, 2003

Dec. 2, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv22363/Python Modified Files: Tag: ast-branch ast.c newcompile.c Log Message: Add support for calls with *args and **kwargs. Index: ast.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/ast.c,v retrieving revision 1.1.2.34 retrieving revision 1.1.2.35 diff -C2 -d -r1.1.2.34 -r1.1.2.35 *** ast.c 15 Oct 2003 06:19:31 -0000 1.1.2.34 --- ast.c 2 Dec 2003 05:53:43 -0000 1.1.2.35 *************** *** 1150,1153 **** --- 1150,1154 ---- asdl_seq *args = NULL; asdl_seq *keywords = NULL; + expr_ty vararg = NULL, kwarg = NULL; REQ(n, arglist); *************** *** 1201,1208 **** } } } /* XXX syntax error if more than 255 arguments */ ! return Call(func, args, keywords, NULL, NULL); error: --- 1202,1217 ---- } } + else if (TYPE(ch) == STAR) { + vararg = ast_for_expr(CHILD(n, i+1)); + i++; + } + else if (TYPE(ch) == DOUBLESTAR) { + kwarg = ast_for_expr(CHILD(n, i+1)); + i++; + } } /* XXX syntax error if more than 255 arguments */ ! return Call(func, args, keywords, vararg, kwarg); error: Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.55 retrieving revision 1.1.2.56 diff -C2 -d -r1.1.2.55 -r1.1.2.56 *** newcompile.c 24 Nov 2003 04:14:34 -0000 1.1.2.55 --- newcompile.c 2 Dec 2003 05:53:43 -0000 1.1.2.56 *************** *** 1622,1625 **** --- 1622,1658 ---- static int + compiler_call(struct compiler *c, expr_ty e) + { + int n, code = 0; + + VISIT(c, expr, e->v.Call.func); + n = asdl_seq_LEN(e->v.Call.args); + if (e->v.Call.starargs) { + VISIT(c, expr, e->v.Call.starargs); + code |= 1; + } + if (e->v.Call.kwargs) { + VISIT(c, expr, e->v.Call.kwargs); + code |= 2; + } + VISIT_SEQ(c, expr, e->v.Call.args); + switch (code) { + case 0: + ADDOP_I(c, CALL_FUNCTION, n); + break; + case 1: + ADDOP_I(c, CALL_FUNCTION_VAR, n); + break; + case 2: + ADDOP_I(c, CALL_FUNCTION_KW, n); + break; + case 3: + ADDOP_I(c, CALL_FUNCTION_VAR_KW, n); + break; + } + return 1; + } + + static int compiler_listcomp_generator(struct compiler *c, listcomp_ty l, expr_ty elt) { *************** *** 1739,1748 **** return compiler_compare(c, e); case Call_kind: ! VISIT(c, expr, e->v.Call.func); ! n = asdl_seq_LEN(e->v.Call.args); ! /* XXX other args */ ! VISIT_SEQ(c, expr, e->v.Call.args); ! ADDOP_I(c, CALL_FUNCTION, n); ! break; case Repr_kind: VISIT(c, expr, e->v.Repr.value); --- 1772,1776 ---- return compiler_compare(c, e); case Call_kind: ! return compiler_call(c, e); case Repr_kind: VISIT(c, expr, e->v.Repr.value);

1 0

python/nondist/peps pep-0237.txt,1.16,1.17
by gvanrossum＠users.sourceforge.net Dec. 1, 2003

Dec. 1, 2003

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv13682 Modified Files: pep-0237.txt Log Message: Record recent changes of heart (see python-dev): - No warnings for operations that changed semantics between 2.3 and 2.4. - Trailing 'L' remains in repr() of long ints until Python 3.0. Index: pep-0237.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0237.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pep-0237.txt 7 Nov 2002 15:41:19 -0000 1.16 --- pep-0237.txt 2 Dec 2003 01:22:50 -0000 1.17 *************** *** 117,133 **** - Currently, repr() of a long int returns a string ending in 'L' ! while repr() of a short int doesn't. The 'L' will be dropped. - Currently, an operation with long operands will never return a short int. This *may* change, since it allows some ! optimization. - The expression type(x).__name__ depends on whether x is a short or a long int. Since implementation alternative 2 is chosen, ! this difference will remain. - Long and short ints are handled different by the marshal module, and by the pickle and cPickle modules. This difference will ! remain. - Short ints with small values (typically between -1 and 99 --- 117,138 ---- - Currently, repr() of a long int returns a string ending in 'L' ! while repr() of a short int doesn't. The 'L' will be dropped; ! but not before Python 3.0. - Currently, an operation with long operands will never return a short int. This *may* change, since it allows some ! optimization. (No changes have been made in this area yet, and ! none are planned.) - The expression type(x).__name__ depends on whether x is a short or a long int. Since implementation alternative 2 is chosen, ! this difference will remain. (In Python 3.0, we *may* be able ! to deploy a trick to hide the difference, because it *is* ! annoying to reveal the difference to user code, and more so as ! the difference between the two types is less visible.) - Long and short ints are handled different by the marshal module, and by the pickle and cPickle modules. This difference will ! remain (at least until Python 3.0). - Short ints with small values (typically between -1 and 99 *************** *** 147,150 **** --- 152,158 ---- any meaning, and will be eventually become illegal. The compiler will choose the appropriate type solely based on the value. + (Until Python 3.0, it will force the literal to be a long; but + literals without a trailing 'L' may also be long, if they are not + representable as short ints.) *************** *** 152,160 **** The function int() will return a short or a long int depending on ! the argument value. The function long() will call the function ! int(). The built-in name 'long' will remain in the language to ! represent the long implementation type, but using the int() ! function is still recommended, since it will automatically return ! a long when needed. --- 160,170 ---- The function int() will return a short or a long int depending on ! the argument value. In Python 3.0, the function long() will call ! the function int(); before then, it will continue to force the ! result to be a long int, but otherwise work the same way as int(). ! The built-in name 'long' will remain in the language to represent ! the long implementation type (unless it is completely eradicated ! in Python 3.0), but using the int() function is still recommended, ! since it will automatically return a long when needed. *************** *** 162,166 **** The C API remains unchanged; C code will still need to be aware of ! the difference between short and long ints. The PyArg_Parse*() APIs already accept long ints, as long as they --- 172,177 ---- The C API remains unchanged; C code will still need to be aware of ! the difference between short and long ints. (The Python 3.0 C API ! will probably be completely incompatible.) The PyArg_Parse*() APIs already accept long ints, as long as they *************** *** 172,176 **** Transition ! There are two major phases to the transition: A. Short int operations that currently raise OverflowError return --- 183,187 ---- Transition ! There are three major phases to the transition: A. Short int operations that currently raise OverflowError return *************** *** 187,203 **** issued at this point, but this is off by default. ! B. The remaining semantic differences are addressed. In most ! cases the long int semantics will prevail; however, the ! trailing 'L' from long int representations will be dropped. ! Eventually, support for integer literals with a trailing 'L' ! will be removed. Since this will introduce backwards ! incompatibilities which will break some old code, this phase ! may require a future statement and/or warnings, and a ! prolonged transition phase. Phase A will be implemented in Python 2.2. ! Phase B will be implemented starting with Python 2.3. Envisioned ! stages of phase B: B0. Warnings are enabled about operations that will change their --- 198,215 ---- issued at this point, but this is off by default. ! B. The remaining semantic differences are addressed. In all cases ! the long int semantics will prevail. Since this will introduce ! backwards incompatibilities which will break some old code, ! this phase may require a future statement and/or warnings, and ! a prolonged transition phase. The trailing 'L' will continue ! to be used for longs as input and by repr(). ! ! C. The trailing 'L' is dropped from repr(), and made illegal on ! input. (If possible, the 'long' type completely disappears.) Phase A will be implemented in Python 2.2. ! Phase B will be implemented gradually in Python 2.3 and Python ! 2.4. Envisioned stages of phase B: B0. Warnings are enabled about operations that will change their *************** *** 205,223 **** '%u', '%x', '%X' and '%o', hex and oct literals in the (inclusive) range [sys.maxint+1, sys.maxint*2+1], and left ! shifts losing bits; but not repr() of a long. ! ! B1. The remaining semantic differences are addressed. Operations ! that give different results than before will issue a warning ! that is on by default. A warning for the use of long literals ! (with a trailing 'L') may be enabled through a command line ! option, but it is off by default. ! ! B2. (This stage is deleted.) ! ! B3. The warnings about operations that give different results than ! before are turned off by default. ! B4. Long literals are no longer legal. All warnings related to ! this issue are gone. We propose the following timeline: --- 217,225 ---- '%u', '%x', '%X' and '%o', hex and oct literals in the (inclusive) range [sys.maxint+1, sys.maxint*2+1], and left ! shifts losing bits. ! B1. The new semantic for these operations are implemented. ! Operations that give different results than before will *not* ! issue a warning. We propose the following timeline: *************** *** 227,235 **** B1. Python 2.4. ! B2. (Not applicable.) ! ! B3. The rest of the Python 2.x line. ! ! B4. Python 3.0 (at least two years in the future). --- 229,234 ---- B1. Python 2.4. ! Phase C will be implemented in Python 3.0 (at least two years ! after Python 2.4 is released). *************** *** 323,329 **** Implementation ! A complete implementation of phase A is present in the current CVS ! tree and will be released with Python 2.2a3. (It didn't make it ! into 2.2a2.) Still missing are documentation and a test suite. --- 322,329 ---- Implementation ! The implementation work for the Python 2.x line is completed; ! phase A was released with Python 2.2, phase B0 with Python 2.3, ! and phase B1 will be released with Python 2.4 (and is already in ! CVS).

1 0