Mailman 3 February 2005 - Python-checkins

python/dist/src/Misc ACKS, 1.292, 1.293 NEWS, 1.1238, 1.1239
by rhettinger＠users.sourceforge.net Feb. 5, 2005

Feb. 5, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15146/Misc Modified Files: ACKS NEWS Log Message: SF patch #1116583: NameError in cookielib domain check Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.292 retrieving revision 1.293 diff -u -d -r1.292 -r1.293 --- ACKS 13 Jan 2005 04:12:27 -0000 1.292 +++ ACKS 5 Feb 2005 01:31:18 -0000 1.293 @@ -399,6 +399,7 @@ Mike Meyer Steven Miale Trent Mick +Chad Miller Roman Milner Dom Mitchell Doug Moen Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1238 retrieving revision 1.1239 diff -u -d -r1.1238 -r1.1239 --- NEWS 4 Feb 2005 18:44:06 -0000 1.1238 +++ NEWS 5 Feb 2005 01:31:19 -0000 1.1239 @@ -51,6 +51,8 @@ Library ------- +- Fixed bug in a NameError bug in cookielib. Patch #1116583. + - Applied a security fix to SimpleXMLRPCserver (PSF-2005-001). This disables recursive traversal through instance attributes, which can be exploited in various ways.

1 0

python/dist/src/Misc NEWS,1.1237,1.1238
by jhylton＠users.sourceforge.net Feb. 4, 2005

Feb. 4, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23479 Modified Files: NEWS Log Message: Add NEWS item about future parser bug. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1237 retrieving revision 1.1238 diff -u -d -r1.1237 -r1.1238 --- NEWS 3 Feb 2005 15:01:24 -0000 1.1237 +++ NEWS 4 Feb 2005 18:44:06 -0000 1.1238 @@ -24,6 +24,10 @@ - Bug #1077106: Poor argument checking could cause memory corruption in calls to os.read(). +- The parser did not complain about future statements in illegal + positions. It once again reports a syntax error if a future + statement occurs after anything other than a doc string. + Extension Modules -----------------

1 0

python/dist/src/Python future.c,2.14,2.15
by jhylton＠users.sourceforge.net Feb. 4, 2005

Feb. 4, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22549/Python Modified Files: future.c Log Message: Fix bug that allowed future statements virtually anywhere in a module. If we exit via the break here, we need to set ff_last_lineno or FUTURE_POSSIBLE() will remain true. The bug affected statements containing a variety of expressions, but not all expressions. It has been present since Python 2.2. Index: future.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/future.c,v retrieving revision 2.14 retrieving revision 2.15 diff -u -d -r2.14 -r2.15 --- future.c 31 Aug 2004 10:07:13 -0000 2.14 +++ future.c 4 Feb 2005 18:38:43 -0000 2.15 @@ -93,7 +93,6 @@ { int i, r; loop: - switch (TYPE(n)) { case single_input: @@ -222,6 +221,7 @@ n = CHILD(n, 0); goto loop; } + ff->ff_last_lineno = n->n_lineno; break; case atom: @@ -258,4 +258,3 @@ } return ff; } -

1 0

python/dist/src/Lib/test test_codecs.py, 1.18, 1.19
by doerwalter＠users.sourceforge.net Feb. 4, 2005

Feb. 4, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27454/Lib/test Modified Files: test_codecs.py Log Message: Add a test for UTF-16 reading where the byte sequence doesn't start with a BOM. Index: test_codecs.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codecs.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- test_codecs.py 10 Jan 2005 12:01:39 -0000 1.18 +++ test_codecs.py 4 Feb 2005 14:15:34 -0000 1.19 @@ -159,6 +159,15 @@ f = reader(s) self.assertEquals(f.read(), u"spamspam") + def test_badbom(self): + s = StringIO.StringIO("\xff\xff") + f = codecs.getwriter(self.encoding)(s) + self.assertRaises(UnicodeError, f.read) + + s = StringIO.StringIO("\xff\xff\xff\xff") + f = codecs.getwriter(self.encoding)(s) + self.assertRaises(UnicodeError, f.read) + def test_partial(self): self.check_partial( u"\x00\xff\u0100\uffff",

1 0

python/dist/src/Lib/distutils/command wininst-7.1.exe, 1.7, 1.8 wininst-6.exe, 1.7, 1.8
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26710 Modified Files: wininst-7.1.exe wininst-6.exe Log Message: Recompiled after source changes. Index: wininst-7.1.exe =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/wininst-7.1.exe,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 Binary files /tmp/cvsfKRHc4 and /tmp/cvsz6wQ4p differ Index: wininst-6.exe =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/wininst-6.exe,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 Binary files /tmp/cvsbUGPs9 and /tmp/cvsjfArov differ

1 0

python/dist/src/Lib/distutils/command wininst-7.1.exe, 1.5.4.1, 1.5.4.2 wininst-6.exe, 1.5.4.1, 1.5.4.2
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25975 Modified Files: Tag: release24-maint wininst-7.1.exe wininst-6.exe Log Message: Recompiled after source changes. Index: wininst-7.1.exe =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/wininst-7.1.exe,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -d -r1.5.4.1 -r1.5.4.2 Binary files /tmp/cvs568EZm and /tmp/cvstCaTNN differ Index: wininst-6.exe =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/wininst-6.exe,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -d -r1.5.4.1 -r1.5.4.2 Binary files /tmp/cvszpWFST and /tmp/cvsmCUO6k differ

1 0

python/dist/src/PC/bdist_wininst install.c, 1.10.4.4, 1.10.4.5
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24067 Modified Files: Tag: release24-maint install.c Log Message: Running a bdist_wininst installer, built with Python 2.3, installing for Python 2.4 caused a segfault when post_install_script was used. The reason was that the file handle passed to PyRun_SimpleFile() was created with MSVCRT.DLL, but Python 2.4 uses MSVCR71.DLL. So, I replaced PyRun_SimpleFile() with PyRun_SimpleString(). The segfault is gone, but the output of the postinstall script doesn't show up, because still freopen() from MSVCRT is used. Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.10.4.4 retrieving revision 1.10.4.5 diff -u -d -r1.10.4.4 -r1.10.4.5 --- install.c 3 Feb 2005 20:09:24 -0000 1.10.4.4 +++ install.c 3 Feb 2005 20:37:04 -0000 1.10.4.5 @@ -88,6 +88,11 @@ #include <stdarg.h> #include <string.h> #include <time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <malloc.h> +#include <io.h> +#include <fcntl.h> #include "archive.h" @@ -671,7 +676,7 @@ * 1 if the Python-dll does not export the functions we need * 2 if no install-script is specified in pathname * 3 if the install-script file could not be opened - * the return value of PyRun_SimpleFile() otherwise, + * the return value of PyRun_SimpleString() otherwise, * which is 0 if everything is ok, -1 if an exception had occurred * in the install-script. */ @@ -681,7 +686,7 @@ { DECLPROC(hPython, void, Py_Initialize, (void)); DECLPROC(hPython, int, PySys_SetArgv, (int, char **)); - DECLPROC(hPython, int, PyRun_SimpleFile, (FILE *, char *)); + DECLPROC(hPython, int, PyRun_SimpleString, (char *)); DECLPROC(hPython, void, Py_Finalize, (void)); DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...)); DECLPROC(hPython, PyObject *, PyCFunction_New, @@ -690,10 +695,10 @@ DECLPROC(hPython, PyObject *, PyErr_Format, (PyObject *, char *)); int result = 0; - FILE *fp; + int fh; if (!Py_Initialize || !PySys_SetArgv - || !PyRun_SimpleFile || !Py_Finalize) + || !PyRun_SimpleString || !Py_Finalize) return 1; if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format) @@ -705,8 +710,8 @@ if (pathname == NULL || pathname[0] == '\0') return 2; - fp = fopen(pathname, "r"); - if (!fp) { + fh = open(pathname, _O_RDONLY); + if (-1 == fh) { fprintf(stderr, "Could not open postinstall-script %s\n", pathname); return 3; @@ -718,10 +723,22 @@ prepare_script_environment(hPython); PySys_SetArgv(argc, argv); - result = PyRun_SimpleFile(fp, pathname); + result = 3; + { + struct _stat statbuf; + if(0 == _fstat(fh, &statbuf)) { + char *script = alloca(statbuf.st_size + 5); + int n = read(fh, script, statbuf.st_size); + if (n > 0) { + script[n] = '\n'; + script[n+1] = 0; + result = PyRun_SimpleString(script); + } + } + } Py_Finalize(); - fclose(fp); + close(fh); return result; } @@ -1804,7 +1821,7 @@ /* Strip the trailing backslash again */ python_dir[strlen(python_dir)-1] = '\0'; - CheckRootKey(hwnd); + CheckRootKey(hwnd); if (!OpenLogfile(python_dir)) break;

1 0

python/dist/src/PC/bdist_wininst install.c, 1.14, 1.15
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23581 Modified Files: install.c Log Message: Running a bdist_wininst installer, built with Python 2.3, installing for Python 2.4 caused a segfault when post_install_script was used. The reason was that the file handle passed to PyRun_SimpleFile() was created with MSVCRT.DLL, but Python 2.4 uses MSVCR71.DLL. So, I replaced PyRun_SimpleFile() with PyRun_SimpleString(). The segfault is gone, but the output of the postinstall script doesn't show up, because still freopen() from MSVCRT is used. Already backported. Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- install.c 3 Feb 2005 20:11:28 -0000 1.14 +++ install.c 3 Feb 2005 20:35:10 -0000 1.15 @@ -88,6 +88,11 @@ #include <stdarg.h> #include <string.h> #include <time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <malloc.h> +#include <io.h> +#include <fcntl.h> #include "archive.h" @@ -671,7 +676,7 @@ * 1 if the Python-dll does not export the functions we need * 2 if no install-script is specified in pathname * 3 if the install-script file could not be opened - * the return value of PyRun_SimpleFile() otherwise, + * the return value of PyRun_SimpleString() otherwise, * which is 0 if everything is ok, -1 if an exception had occurred * in the install-script. */ @@ -681,7 +686,7 @@ { DECLPROC(hPython, void, Py_Initialize, (void)); DECLPROC(hPython, int, PySys_SetArgv, (int, char **)); - DECLPROC(hPython, int, PyRun_SimpleFile, (FILE *, char *)); + DECLPROC(hPython, int, PyRun_SimpleString, (char *)); DECLPROC(hPython, void, Py_Finalize, (void)); DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...)); DECLPROC(hPython, PyObject *, PyCFunction_New, @@ -690,10 +695,10 @@ DECLPROC(hPython, PyObject *, PyErr_Format, (PyObject *, char *)); int result = 0; - FILE *fp; + int fh; if (!Py_Initialize || !PySys_SetArgv - || !PyRun_SimpleFile || !Py_Finalize) + || !PyRun_SimpleString || !Py_Finalize) return 1; if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format) @@ -705,8 +710,8 @@ if (pathname == NULL || pathname[0] == '\0') return 2; - fp = fopen(pathname, "r"); - if (!fp) { + fh = open(pathname, _O_RDONLY); + if (-1 == fh) { fprintf(stderr, "Could not open postinstall-script %s\n", pathname); return 3; @@ -718,10 +723,22 @@ prepare_script_environment(hPython); PySys_SetArgv(argc, argv); - result = PyRun_SimpleFile(fp, pathname); + result = 3; + { + struct _stat statbuf; + if(0 == _fstat(fh, &statbuf)) { + char *script = alloca(statbuf.st_size + 5); + int n = read(fh, script, statbuf.st_size); + if (n > 0) { + script[n] = '\n'; + script[n+1] = 0; + result = PyRun_SimpleString(script); + } + } + } Py_Finalize(); - fclose(fp); + close(fh); return result; }

1 0

python/dist/src/PC/bdist_wininst install.c, 1.13, 1.14
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18261 Modified Files: install.c Log Message: Set PYTHONHOME before loading Python, so that sys.path will be set correctly. Already backported. Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- install.c 22 Dec 2004 17:24:14 -0000 1.13 +++ install.c 3 Feb 2005 20:11:28 -0000 1.14 @@ -613,7 +613,13 @@ char fullpath[_MAX_PATH]; LONG size = sizeof(fullpath); char subkey_name[80]; - HINSTANCE h = LoadLibrary(fname); + char buffer[260 + 12]; + HINSTANCE h; + + /* make sure PYTHONHOME is set, to that sys.path is initialized correctly */ + wsprintf(buffer, "PYTHONHOME=%s", python_dir); + _putenv(buffer); + h = LoadLibrary(fname); if (h) return h; wsprintf(subkey_name,

1 0

python/dist/src/PC/bdist_wininst install.c, 1.10.4.3, 1.10.4.4
by theller＠users.sourceforge.net Feb. 3, 2005

Feb. 3, 2005

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17857 Modified Files: Tag: release24-maint install.c Log Message: Set PYTHONHOME before loading Python, so that sys.path will be set correctly. Already backported. Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.10.4.3 retrieving revision 1.10.4.4 diff -u -d -r1.10.4.3 -r1.10.4.4 --- install.c 22 Dec 2004 16:49:05 -0000 1.10.4.3 +++ install.c 3 Feb 2005 20:09:24 -0000 1.10.4.4 @@ -613,7 +613,13 @@ char fullpath[_MAX_PATH]; LONG size = sizeof(fullpath); char subkey_name[80]; - HINSTANCE h = LoadLibrary(fname); + char buffer[260 + 12]; + HINSTANCE h; + + /* make sure PYTHONHOME is set, to that sys.path is initialized correctly */ + wsprintf(buffer, "PYTHONHOME=%s", python_dir); + _putenv(buffer); + h = LoadLibrary(fname); if (h) return h; wsprintf(subkey_name,

1 0