Mailman 3 September 2003 - Python-checkins

python/dist/src/Doc/html style.css,1.28,1.29
by fdrake＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Doc/html In directory sc8-pr-cvs1:/tmp/cvs-serv11932/html Modified Files: style.css Log Message: Make the redundent portion of the lower navigation area disappear from the printed version for browsers that support "@media print" in CSS. Index: style.css =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/html/style.css,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** style.css 29 Aug 2003 04:09:26 -0000 1.28 --- style.css 4 Sep 2003 19:30:15 -0000 1.29 *************** *** 141,142 **** --- 141,150 ---- */ .availability .platform { font-weight: bold; } + + + /* + * Some specialization for printed output. + */ + @media print { + #bottom-navigation-panel { display: none; } + }

1 0

python/dist/src/Misc NEWS,1.831.4.32,1.831.4.33
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv6327/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #788249: Pass an explicit buffer to setvbuf in PyFile_SetBufSize(). Fixes #603724. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.32 retrieving revision 1.831.4.33 diff -C2 -d -r1.831.4.32 -r1.831.4.33 *** NEWS 4 Sep 2003 18:52:07 -0000 1.831.4.32 --- NEWS 4 Sep 2003 19:02:20 -0000 1.831.4.33 *************** *** 13,16 **** --- 13,18 ---- ----------------- + - Bug #603724: Pass an explicit buffer to setvbuf in PyFile_SetBufSize(). + - Bug #795506: The % formatting operator did not support '%F' as had been documented.

1 0

python/dist/src/Include fileobject.h, 2.32, 2.32.8.1
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv6327/Include Modified Files: Tag: release23-maint fileobject.h Log Message: Patch #788249: Pass an explicit buffer to setvbuf in PyFile_SetBufSize(). Fixes #603724. Index: fileobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/fileobject.h,v retrieving revision 2.32 retrieving revision 2.32.8.1 diff -C2 -d -r2.32 -r2.32.8.1 *** fileobject.h 10 May 2003 07:08:50 -0000 2.32 --- fileobject.h 4 Sep 2003 19:02:20 -0000 2.32.8.1 *************** *** 20,23 **** --- 20,24 ---- char* f_bufend; /* Points after last occupied position */ char* f_bufptr; /* Current buffer position */ + char *f_setbuf; /* Buffer for setbuf(3) and setvbuf(3) */ #ifdef WITH_UNIVERSAL_NEWLINES int f_univ_newline; /* Handle any newline convention */

1 0

python/dist/src/Objects fileobject.c,2.180,2.181
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv5789/Objects Modified Files: fileobject.c Log Message: Patch #788249: Pass an explicit buffer to setvbuf in PyFile_SetBufSize(). Fixes #603724. Will backport to 2.3. Index: fileobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v retrieving revision 2.180 retrieving revision 2.181 diff -C2 -d -r2.180 -r2.181 *** fileobject.c 15 Aug 2003 20:05:45 -0000 2.180 --- fileobject.c 4 Sep 2003 19:01:46 -0000 2.181 *************** *** 284,289 **** PyFile_SetBufSize(PyObject *f, int bufsize) { if (bufsize >= 0) { - #ifdef HAVE_SETVBUF int type; switch (bufsize) { --- 284,289 ---- PyFile_SetBufSize(PyObject *f, int bufsize) { + PyFileObject *file = (PyFileObject *)f; if (bufsize >= 0) { int type; switch (bufsize) { *************** *** 291,306 **** type = _IONBF; break; case 1: type = _IOLBF; bufsize = BUFSIZ; break; default: type = _IOFBF; } ! setvbuf(((PyFileObject *)f)->f_fp, (char *)NULL, ! type, bufsize); #else /* !HAVE_SETVBUF */ ! if (bufsize <= 1) ! setbuf(((PyFileObject *)f)->f_fp, (char *)NULL); #endif /* !HAVE_SETVBUF */ } --- 291,318 ---- type = _IONBF; break; + #ifdef HAVE_SETVBUF case 1: type = _IOLBF; bufsize = BUFSIZ; break; + #endif default: type = _IOFBF; + #ifndef HAVE_SETVBUF + bufsize = BUFSIZ; + #endif + break; } ! fflush(file->f_fp); ! if (type == _IONBF) { ! PyMem_Free(file->f_setbuf); ! file->f_setbuf = NULL; ! } else { ! file->f_setbuf = PyMem_Realloc(file->f_setbuf, bufsize); ! } ! #ifdef HAVE_SETVBUF ! setvbuf(file->f_fp, file->f_setbuf, type, bufsize); #else /* !HAVE_SETVBUF */ ! setbuf(file->f_fp, file->f_setbuf); #endif /* !HAVE_SETVBUF */ } *************** *** 377,380 **** --- 389,393 ---- { int sts = 0; + PyMem_Free(f->f_setbuf); if (f->f_fp != NULL) { if (f->f_close != NULL) { *************** *** 1929,1932 **** --- 1942,1946 ---- if (open_the_file(foself, name, mode) == NULL) goto Error; + foself->f_setbuf = NULL; PyFile_SetBufSize(self, bufsize); goto Done;

1 0

python/dist/src/Include fileobject.h,2.32,2.33
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv5789/Include Modified Files: fileobject.h Log Message: Patch #788249: Pass an explicit buffer to setvbuf in PyFile_SetBufSize(). Fixes #603724. Will backport to 2.3. Index: fileobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/fileobject.h,v retrieving revision 2.32 retrieving revision 2.33 diff -C2 -d -r2.32 -r2.33 *** fileobject.h 10 May 2003 07:08:50 -0000 2.32 --- fileobject.h 4 Sep 2003 19:01:45 -0000 2.33 *************** *** 20,23 **** --- 20,24 ---- char* f_bufend; /* Points after last occupied position */ char* f_bufptr; /* Current buffer position */ + char *f_setbuf; /* Buffer for setbuf(3) and setvbuf(3) */ #ifdef WITH_UNIVERSAL_NEWLINES int f_univ_newline; /* Handle any newline convention */

1 0

python/dist/src configure, 1.416.4.1, 1.416.4.2 configure.in, 1.427.4.1, 1.427.4.2
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv4112 Modified Files: Tag: release23-maint configure configure.in Log Message: Patch #798202: detect redhat9 Tcl/Tk in configure script. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.416.4.1 retrieving revision 1.416.4.2 diff -C2 -d -r1.416.4.1 -r1.416.4.2 *** configure 9 Aug 2003 09:07:55 -0000 1.416.4.1 --- configure 4 Sep 2003 18:52:06 -0000 1.416.4.2 *************** *** 1,4 **** #! /bin/sh ! # From configure.in Revision: 1.427 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.3. --- 1,4 ---- #! /bin/sh ! # From configure.in Revision: 1.427.4.1 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.3. *************** *** 17509,17512 **** --- 17509,17564 ---- fi + echo "$as_me:$LINENO: checking for UCS-4 tcl" >&5 + echo $ECHO_N "checking for UCS-4 tcl... $ECHO_C" >&6 + have_ucs4_tcl=no + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include <tcl.h> + #if TCL_UTF_MAX != 6 + # error "NOT UCS4_TCL" + #endif + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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 + + + cat >>confdefs.h <<\_ACEOF + #define HAVE_UCS4_TCL 1 + _ACEOF + + have_ucs4_tcl=yes + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $have_ucs4_tcl" >&5 + echo "${ECHO_T}$have_ucs4_tcl" >&6 + echo "$as_me:$LINENO: checking what type to use for unicode" >&5 echo $ECHO_N "checking what type to use for unicode... $ECHO_C" >&6 *************** *** 17522,17526 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 17574,17583 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.427.4.1 retrieving revision 1.427.4.2 diff -C2 -d -r1.427.4.1 -r1.427.4.2 *** configure.in 9 Aug 2003 09:07:56 -0000 1.427.4.1 --- configure.in 4 Sep 2003 18:52:07 -0000 1.427.4.2 *************** *** 2636,2639 **** --- 2636,2651 ---- fi + AC_MSG_CHECKING(for UCS-4 tcl) + have_ucs4_tcl=no + AC_TRY_COMPILE([ + #include <tcl.h> + #if TCL_UTF_MAX != 6 + # error "NOT UCS4_TCL" + #endif], [], [ + AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6]) + have_ucs4_tcl=yes + ]) + AC_MSG_RESULT($have_ucs4_tcl) + AC_MSG_CHECKING(what type to use for unicode) dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output *************** *** 2646,2650 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 2658,2667 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi

1 0

python/dist/src/Misc NEWS,1.831.4.31,1.831.4.32
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv4112/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #798202: detect redhat9 Tcl/Tk in configure script. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.31 retrieving revision 1.831.4.32 diff -C2 -d -r1.831.4.31 -r1.831.4.32 *** NEWS 4 Sep 2003 18:46:39 -0000 1.831.4.31 --- NEWS 4 Sep 2003 18:52:07 -0000 1.831.4.32 *************** *** 102,105 **** --- 102,107 ---- ----- + - Patch #798202: detect redhat9 Tcl/Tk in configure script. + C API -----

1 0

python/dist/src configure, 1.419, 1.420 configure.in, 1.430, 1.431
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv3845 Modified Files: configure configure.in Log Message: Patch #798202: detect redhat9 Tcl/Tk in configure script. Will backport to 2.2. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.419 retrieving revision 1.420 diff -C2 -d -r1.419 -r1.420 *** configure 4 Sep 2003 11:04:04 -0000 1.419 --- configure 4 Sep 2003 18:50:52 -0000 1.420 *************** *** 1,4 **** #! /bin/sh ! # From configure.in Revision: 1.429 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. --- 1,4 ---- #! /bin/sh ! # From configure.in Revision: 1.430 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. *************** *** 17521,17524 **** --- 17521,17576 ---- fi + echo "$as_me:$LINENO: checking for UCS-4 tcl" >&5 + echo $ECHO_N "checking for UCS-4 tcl... $ECHO_C" >&6 + have_ucs4_tcl=no + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include <tcl.h> + #if TCL_UTF_MAX != 6 + # error "NOT UCS4_TCL" + #endif + int + main () + { + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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 + + + cat >>confdefs.h <<\_ACEOF + #define HAVE_UCS4_TCL 1 + _ACEOF + + have_ucs4_tcl=yes + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $have_ucs4_tcl" >&5 + echo "${ECHO_T}$have_ucs4_tcl" >&6 + echo "$as_me:$LINENO: checking what type to use for unicode" >&5 echo $ECHO_N "checking what type to use for unicode... $ECHO_C" >&6 *************** *** 17534,17538 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 17586,17595 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.430 retrieving revision 1.431 diff -C2 -d -r1.430 -r1.431 *** configure.in 4 Sep 2003 11:04:04 -0000 1.430 --- configure.in 4 Sep 2003 18:50:54 -0000 1.431 *************** *** 2648,2651 **** --- 2648,2663 ---- fi + AC_MSG_CHECKING(for UCS-4 tcl) + have_ucs4_tcl=no + AC_TRY_COMPILE([ + #include <tcl.h> + #if TCL_UTF_MAX != 6 + # error "NOT UCS4_TCL" + #endif], [], [ + AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6]) + have_ucs4_tcl=yes + ]) + AC_MSG_RESULT($have_ucs4_tcl) + AC_MSG_CHECKING(what type to use for unicode) dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output *************** *** 2658,2662 **** then # Without any arguments, Py_UNICODE defaults to two-byte mode ! enable_unicode="ucs2" fi --- 2670,2679 ---- then # Without any arguments, Py_UNICODE defaults to two-byte mode ! case "$have_ucs4_tcl" in ! yes) enable_unicode="ucs4" ! ;; ! *) enable_unicode="ucs2" ! ;; ! esac fi

1 0

python/dist/src/Misc NEWS,1.831.4.30,1.831.4.31
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv2966/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #794826: Add __file__ in dynamically loaded modules for multiple interpreters. Fixes #698282. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.30 retrieving revision 1.831.4.31 diff -C2 -d -r1.831.4.30 -r1.831.4.31 *** NEWS 4 Sep 2003 18:26:06 -0000 1.831.4.30 --- NEWS 4 Sep 2003 18:46:39 -0000 1.831.4.31 *************** *** 21,24 **** --- 21,26 ---- ----------------- + - Bug #698282: Add __file__ to dynamic modules in multiple interpreters. + - Patch #798145: Return correct information from nl_langinfo(RADIXCHAR).

1 0

python/dist/src/Python importdl.c,2.70,2.70.14.1
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv2966/Python Modified Files: Tag: release23-maint importdl.c Log Message: Patch #794826: Add __file__ in dynamically loaded modules for multiple interpreters. Fixes #698282. Index: importdl.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/importdl.c,v retrieving revision 2.70 retrieving revision 2.70.14.1 diff -C2 -d -r2.70 -r2.70.14.1 *** importdl.c 26 Aug 2002 21:15:11 -0000 2.70 --- importdl.c 4 Sep 2003 18:46:39 -0000 2.70.14.1 *************** *** 55,60 **** if (PyErr_Occurred()) return NULL; - if (_PyImport_FixupExtension(name, pathname) == NULL) - return NULL; m = PyDict_GetItemString(PyImport_GetModuleDict(), name); --- 55,58 ---- *************** *** 67,70 **** --- 65,71 ---- if (PyModule_AddStringConstant(m, "__file__", pathname) < 0) PyErr_Clear(); /* Not important enough to report */ + + if (_PyImport_FixupExtension(name, pathname) == NULL) + return NULL; if (Py_VerboseFlag) PySys_WriteStderr(

1 0