Mailman 3 October 2004 - Python-checkins

python/nondist/peps pep-0291.txt,1.11,1.12
by effbot＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11060 Modified Files: pep-0291.txt Log Message: added subprocess to the compatibility PEP Index: pep-0291.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0291.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pep-0291.txt 20 Aug 2004 07:32:06 -0000 1.11 +++ pep-0291.txt 13 Oct 2004 15:57:42 -0000 1.12 @@ -85,6 +85,7 @@ email Barry Warsaw 2.1 / 2.3 [1] logging Vinay Sajip 1.5.2 sre Fredrik Lundh 2.1 + subprocess Peter Astrand 2.2 xml (PyXML) Martin v. Loewis 2.0 xmlrpclib Fredrik Lundh 2.1 modulefinder Thomas Heller 2.2

1 0

python/dist/src/Lib/distutils sysconfig.py, 1.60, 1.61
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/distutils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10291/Lib/distutils Modified Files: sysconfig.py Log Message: Patch 983206: distutils obeys LDSHARED env var. Removed the code in Python's own setup.py that did the same thing (and tested on Solaris, where LDSHARED is needed...) Index: sysconfig.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- sysconfig.py 18 Jul 2004 06:14:42 -0000 1.60 +++ sysconfig.py 13 Oct 2004 15:54:16 -0000 1.61 @@ -153,6 +153,8 @@ cc = os.environ['CC'] if os.environ.has_key('CXX'): cxx = os.environ['CXX'] + if os.environ.has_key('LDSHARED'): + ldshared = os.environ['LDSHARED'] if os.environ.has_key('CPP'): cpp = os.environ['CPP'] else:

1 0

python/dist/src/Misc NEWS, 1.1161, 1.1162 ACKS, 1.284, 1.285
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10291/Misc Modified Files: NEWS ACKS Log Message: Patch 983206: distutils obeys LDSHARED env var. Removed the code in Python's own setup.py that did the same thing (and tested on Solaris, where LDSHARED is needed...) Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1161 retrieving revision 1.1162 diff -u -d -r1.1161 -r1.1162 --- NEWS 13 Oct 2004 14:55:56 -0000 1.1161 +++ NEWS 13 Oct 2004 15:54:17 -0000 1.1162 @@ -47,6 +47,9 @@ Library ------- +- Patch 983206: distutils now obeys environment variable LDSHARED, if + it is set. + - Added Peter Astrand's subprocess.py module. See PEP 324 for details. - time.strptime() now properly escapes timezones and all other locale-specific Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.284 retrieving revision 1.285 diff -u -d -r1.284 -r1.285 --- ACKS 13 Oct 2004 14:55:56 -0000 1.284 +++ ACKS 13 Oct 2004 15:54:17 -0000 1.285 @@ -499,6 +499,7 @@ Hugo van Rossum Saskia van Rossum Donald Wallace Rouse II +Liam Routt Audun S. Runde Jeff Rush Sam Rushing

1 0

python/dist/src setup.py,1.202,1.203
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10291 Modified Files: setup.py Log Message: Patch 983206: distutils obeys LDSHARED env var. Removed the code in Python's own setup.py that did the same thing (and tested on Solaris, where LDSHARED is needed...) Index: setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/setup.py,v retrieving revision 1.202 retrieving revision 1.203 diff -u -d -r1.202 -r1.203 --- setup.py 28 Sep 2004 03:49:52 -0000 1.202 +++ setup.py 13 Oct 2004 15:54:16 -0000 1.203 @@ -167,15 +167,12 @@ # those environment variables passed into the setup.py phase. Here's # a small set of useful ones. compiler = os.environ.get('CC') - linker_so = os.environ.get('LDSHARED') args = {} # unfortunately, distutils doesn't let us provide separate C and C++ # compilers if compiler is not None: (ccshared,opt,base) = sysconfig.get_config_vars('CCSHARED','OPT','BASECFLAGS') args['compiler_so'] = compiler + ' ' + opt + ' ' + ccshared + ' ' + base - if linker_so is not None: - args['linker_so'] = linker_so self.compiler.set_executables(**args) build_ext.build_extensions(self)

1 0

python/dist/src configure, 1.458, 1.459 configure.in, 1.471, 1.472 pyconfig.h.in, 1.104, 1.105
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5027 Modified Files: configure configure.in pyconfig.h.in Log Message: Patch 977343, Solaris likes sys/loadavg.h. Added support for sys/loadavg.h detection to configure &c. Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.458 retrieving revision 1.459 diff -u -d -r1.458 -r1.459 --- configure 18 Sep 2004 10:07:02 -0000 1.458 +++ configure 13 Oct 2004 15:30:45 -0000 1.459 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.470 . +# From configure.in Revision: 1.471 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.4. # @@ -4532,11 +4532,13 @@ + for ac_header in curses.h dlfcn.h fcntl.h grp.h langinfo.h \ libintl.h ncurses.h poll.h pthread.h \ stropts.h termios.h thread.h \ unistd.h utime.h \ -sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \ +sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \ +sys/modem.h \ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \ sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.471 retrieving revision 1.472 diff -u -d -r1.471 -r1.472 --- configure.in 18 Sep 2004 10:07:03 -0000 1.471 +++ configure.in 13 Oct 2004 15:30:55 -0000 1.472 @@ -959,7 +959,8 @@ libintl.h ncurses.h poll.h pthread.h \ stropts.h termios.h thread.h \ unistd.h utime.h \ -sys/audioio.h sys/bsdtty.h sys/file.h sys/lock.h sys/mkdev.h sys/modem.h \ +sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \ +sys/modem.h \ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \ sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ Index: pyconfig.h.in =================================================================== RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- pyconfig.h.in 18 Sep 2004 09:54:52 -0000 1.104 +++ pyconfig.h.in 13 Oct 2004 15:30:55 -0000 1.105 @@ -512,6 +512,9 @@ /* Define to 1 if you have the <sys/file.h> header file. */ #undef HAVE_SYS_FILE_H +/* Define to 1 if you have the <sys/loadavg.h> header file. */ +#undef HAVE_SYS_LOADAVG_H + /* Define to 1 if you have the <sys/lock.h> header file. */ #undef HAVE_SYS_LOCK_H

1 0

python/dist/src/Modules posixmodule.c, 2.328, 2.329
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5027/Modules Modified Files: posixmodule.c Log Message: Patch 977343, Solaris likes sys/loadavg.h. Added support for sys/loadavg.h detection to configure &c. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.328 retrieving revision 2.329 diff -u -d -r2.328 -r2.329 --- posixmodule.c 13 Oct 2004 14:48:49 -0000 2.328 +++ posixmodule.c 13 Oct 2004 15:30:56 -0000 2.329 @@ -67,6 +67,10 @@ #include <sysexits.h> #endif /* HAVE_SYSEXITS_H */ +#ifdef HAVE_SYS_LOADAVG_H +#include <sys/loadavg.h> +#endif + /* Various compilers have only certain posix functions */ /* XXX Gosh I wish these were all moved into pyconfig.h */ #if defined(PYCC_VACPP) && defined(PYOS_OS2)

1 0

python/dist/src/Misc ACKS, 1.283, 1.284 NEWS, 1.1160, 1.1161
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29208/Misc Modified Files: ACKS NEWS Log Message: 969574 Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.283 retrieving revision 1.284 diff -u -d -r1.283 -r1.284 --- ACKS 18 Sep 2004 09:03:49 -0000 1.283 +++ ACKS 13 Oct 2004 14:55:56 -0000 1.284 @@ -391,6 +391,7 @@ Craig McPheeters Lambert Meertens Bill van Melle +Luke Mewburn Mike Meyer Steven Miale Trent Mick Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1160 retrieving revision 1.1161 diff -u -d -r1.1160 -r1.1161 --- NEWS 12 Oct 2004 15:32:10 -0000 1.1160 +++ NEWS 13 Oct 2004 14:55:56 -0000 1.1161 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- Patch #975056: Restartable signals were not correctly disabled on + BSD systems. Consistently use PyOS_setsig() instead of signal(). + - The internal portable implementation of thread-local storage (TLS), used by the ``PyGILState_Ensure()``/``PyGILState_Release()`` API, was not thread-correct. This could lead to a variety of problems, up to and

1 0

python/dist/src/Modules posixmodule.c, 2.327, 2.328 signalmodule.c, 2.75, 2.76 socketmodule.c, 1.307, 1.308
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/Modules Modified Files: posixmodule.c signalmodule.c socketmodule.c Log Message: Patch #975056 - fixes for restartable signals on *BSD. In addition, a few remaining calls to signal() were converted to PyOS_setsig(). Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.327 retrieving revision 2.328 diff -u -d -r2.327 -r2.328 --- posixmodule.c 27 Sep 2004 19:54:33 -0000 2.327 +++ posixmodule.c 13 Oct 2004 14:48:49 -0000 2.328 @@ -2903,18 +2903,18 @@ master_fd = open(DEV_PTY_FILE, O_RDWR | O_NOCTTY); /* open master */ if (master_fd < 0) return posix_error(); - sig_saved = signal(SIGCHLD, SIG_DFL); + sig_saved = PyOS_setsig(SIGCHLD, SIG_DFL); /* change permission of slave */ if (grantpt(master_fd) < 0) { - signal(SIGCHLD, sig_saved); + PyOS_setsig(SIGCHLD, sig_saved); return posix_error(); } /* unlock slave */ if (unlockpt(master_fd) < 0) { - signal(SIGCHLD, sig_saved); + PyOS_setsig(SIGCHLD, sig_saved); return posix_error(); } - signal(SIGCHLD, sig_saved); + PyOS_setsig(SIGCHLD, sig_saved); slave_name = ptsname(master_fd); /* get name of slave */ if (slave_name == NULL) return posix_error(); Index: signalmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v retrieving revision 2.75 retrieving revision 2.76 diff -u -d -r2.75 -r2.76 --- signalmodule.c 17 Jun 2004 15:55:53 -0000 2.75 +++ signalmodule.c 13 Oct 2004 14:48:50 -0000 2.76 @@ -137,9 +137,6 @@ return; } #endif -#ifdef HAVE_SIGINTERRUPT - siginterrupt(sig_num, 1); -#endif PyOS_setsig(sig_num, signal_handler); } @@ -217,9 +214,6 @@ } else func = signal_handler; -#ifdef HAVE_SIGINTERRUPT - siginterrupt(sig_num, 1); -#endif if (PyOS_setsig(sig_num, func) == SIG_ERR) { PyErr_SetFromErrno(PyExc_RuntimeError); return NULL; Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.307 retrieving revision 1.308 diff -u -d -r1.307 -r1.308 --- socketmodule.c 28 Sep 2004 02:19:40 -0000 1.307 +++ socketmodule.c 13 Oct 2004 14:48:50 -0000 1.308 @@ -217,7 +217,7 @@ /* Generic includes */ #include <sys/types.h> -#include <signal.h> +//#include <signal.h> /* Generic socket object definitions and includes */ #define PySocket_BUILDING_SOCKET

1 0

python/dist/src/Parser intrcheck.c,2.45,2.46
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/Parser Modified Files: intrcheck.c Log Message: Patch #975056 - fixes for restartable signals on *BSD. In addition, a few remaining calls to signal() were converted to PyOS_setsig(). Index: intrcheck.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Parser/intrcheck.c,v retrieving revision 2.45 retrieving revision 2.46 diff -u -d -r2.45 -r2.46 --- intrcheck.c 20 Nov 2003 01:44:58 -0000 2.45 +++ intrcheck.c 13 Oct 2004 14:48:50 -0000 2.46 @@ -137,7 +137,7 @@ Py_Exit(1); break; } - signal(SIGINT, intcatcher); + PyOS_setsig(SIGINT, intcatcher); Py_AddPendingCall(checksignals_witharg, NULL); } @@ -146,23 +146,14 @@ void PyOS_InitInterrupts(void) { - if ((old_siginthandler = signal(SIGINT, SIG_IGN)) != SIG_IGN) - signal(SIGINT, intcatcher); -#ifdef HAVE_SIGINTERRUPT - /* This is for SunOS and other modern BSD derivatives. - It means that system calls (like read()) are not restarted - after an interrupt. This is necessary so interrupting a - read() or readline() call works as expected. - XXX On old BSD (pure 4.2 or older) you may have to do this - differently! */ - siginterrupt(SIGINT, 1); -#endif /* HAVE_SIGINTERRUPT */ + if ((old_siginthandler = PyOS_setsig(SIGINT, SIG_IGN)) != SIG_IGN) + PyOS_setsig(SIGINT, intcatcher); } void PyOS_FiniInterrupts(void) { - signal(SIGINT, old_siginthandler); + PyOS_setsig(SIGINT, old_siginthandler); } int

1 0

python/dist/src/Python pythonrun.c,2.210,2.211
by anthonybaxter＠users.sourceforge.net 13 Oct '04

13 Oct '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121/Python Modified Files: pythonrun.c Log Message: Patch #975056 - fixes for restartable signals on *BSD. In addition, a few remaining calls to signal() were converted to PyOS_setsig(). Index: pythonrun.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v retrieving revision 2.210 retrieving revision 2.211 diff -u -d -r2.210 -r2.211 --- pythonrun.c 11 Oct 2004 02:40:51 -0000 2.210 +++ pythonrun.c 13 Oct 2004 14:48:50 -0000 2.211 @@ -1576,13 +1576,13 @@ initsigs(void) { #ifdef SIGPIPE - signal(SIGPIPE, SIG_IGN); + PyOS_setsig(SIGPIPE, SIG_IGN); #endif #ifdef SIGXFZ - signal(SIGXFZ, SIG_IGN); + PyOS_setsig(SIGXFZ, SIG_IGN); #endif #ifdef SIGXFSZ - signal(SIGXFSZ, SIG_IGN); + PyOS_setsig(SIGXFSZ, SIG_IGN); #endif PyOS_InitInterrupts(); /* May imply initsignal() */ } @@ -1646,18 +1646,14 @@ { #ifdef HAVE_SIGACTION struct sigaction context; - /* Initialize context.sa_handler to SIG_ERR which makes about as - * much sense as anything else. It should get overwritten if - * sigaction actually succeeds and otherwise we avoid an - * uninitialized memory read. - */ - context.sa_handler = SIG_ERR; - sigaction(sig, NULL, &context); + if (sigaction(sig, NULL, &context) == -1) + return SIG_ERR; return context.sa_handler; #else PyOS_sighandler_t handler; handler = signal(sig, SIG_IGN); - signal(sig, handler); + if (handler != SIG_ERR) + signal(sig, handler); return handler; #endif } @@ -1666,20 +1662,19 @@ PyOS_setsig(int sig, PyOS_sighandler_t handler) { #ifdef HAVE_SIGACTION - struct sigaction context; - PyOS_sighandler_t oldhandler; - /* Initialize context.sa_handler to SIG_ERR which makes about as - * much sense as anything else. It should get overwritten if - * sigaction actually succeeds and otherwise we avoid an - * uninitialized memory read. - */ - context.sa_handler = SIG_ERR; - sigaction(sig, NULL, &context); - oldhandler = context.sa_handler; + struct sigaction context, ocontext; context.sa_handler = handler; - sigaction(sig, &context, NULL); - return oldhandler; + sigemptyset(&context.sa_mask); + context.sa_flags = 0; + if (sigaction(sig, &context, &ocontext) == -1) + return SIG_ERR; + return ocontext.sa_handler; #else - return signal(sig, handler); + PyOS_sighandler_t oldhandler; + oldhandler = signal(sig, handler); +#ifdef HAVE_SIGINTERRUPT + siginterrupt(sig, 1); +#endif + return oldhandler; #endif }

1 0