Mailman 3 May 2006 - Python-checkins

r46581 - python/trunk/Modules/_struct.c
by tim.peters May 31, 2006

May 31, 2006

Author: tim.peters Date: Wed May 31 17:33:22 2006 New Revision: 46581 Modified: python/trunk/Modules/_struct.c Log: _range_error(): Speed and simplify (there's no real need for loops here). Assert that size_t is actually big enough, and that f->size is at least one. Wrap a long line. Modified: python/trunk/Modules/_struct.c ============================================================================== --- python/trunk/Modules/_struct.c (original) +++ python/trunk/Modules/_struct.c Wed May 31 17:33:22 2006 @@ -308,26 +308,27 @@ static int _range_error(const formatdef *f, int is_unsigned) { - if (is_unsigned == 0) { - Py_ssize_t smallest, largest = 0; - Py_ssize_t i = f->size * 8; - while (--i > 0) { - largest = (largest * 2) + 1; - } - smallest = -largest - 1; + /* ulargest is the largest unsigned value with f->size bytes. + * Note that the simpler: + * ((size_t)1 << (f->size * 8)) - 1 + * doesn't work when f->size == size_t because C doesn't define what + * happens when a left shift count is >= the number of bits in the + * integer being shifted; e.g., on some boxes it doesn't shift at + * all when they're equal. + */ + const size_t ulargest = (size_t)-1 >> ((SIZEOF_SIZE_T - f->size)*8); + assert(f->size >= 1 && f->size <= SIZEOF_SIZE_T); + if (is_unsigned) PyErr_Format(StructError, - "'%c' format requires %zd <= number <= %zd", + "'%c' format requires 0 <= number <= %zu", f->format, - smallest, - largest); - } else { - size_t largest = 0; - Py_ssize_t i = f->size * 8; - while (--i >= 0) - largest = (largest * 2) + 1; + ulargest); + else { + const Py_ssize_t largest = (Py_ssize_t)(ulargest >> 1); PyErr_Format(StructError, - "'%c' format requires 0 <= number <= %zu", + "'%c' format requires %zd <= number <= %zd", f->format, + ~ largest, largest); } #ifdef PY_STRUCT_OVERFLOW_MASKING @@ -343,7 +344,8 @@ Py_XDECREF(ptraceback); if (msg == NULL) return -1; - rval = PyErr_Warn(PyExc_DeprecationWarning, PyString_AS_STRING(msg)); + rval = PyErr_Warn(PyExc_DeprecationWarning, + PyString_AS_STRING(msg)); Py_DECREF(msg); if (rval == 0) return 0;

1 0

r46580 - python/trunk/Modules/_struct.c
by tim.peters May 31, 2006

May 31, 2006

Author: tim.peters Date: Wed May 31 16:28:07 2006 New Revision: 46580 Modified: python/trunk/Modules/_struct.c Log: Trimmed trailing whitespace. Modified: python/trunk/Modules/_struct.c ============================================================================== --- python/trunk/Modules/_struct.c (original) +++ python/trunk/Modules/_struct.c Wed May 31 16:28:07 2006 @@ -1219,7 +1219,7 @@ const formatdef *f; const formatdef *e; formatcode *codes; - + const char *s; const char *fmt; char c; @@ -1228,7 +1228,7 @@ fmt = PyString_AS_STRING(self->s_format); f = whichtable((char **)&fmt); - + s = fmt; size = 0; len = 0; @@ -1256,7 +1256,7 @@ e = getentry(c, f); if (e == NULL) return -1; - + switch (c) { case 's': /* fall through */ case 'p': len++; break; @@ -1283,7 +1283,7 @@ return -1; } self->s_codes = codes; - + s = fmt; size = 0; while ((c = *s++) != '\0') { @@ -1300,7 +1300,7 @@ num = 1; e = getentry(c, f); - + size = align(size, c, e); if (c == 's' || c == 'p') { codes->offset = size; @@ -1323,7 +1323,7 @@ codes->fmtdef = NULL; codes->offset = size; codes->size = 0; - + return 0; } @@ -1363,7 +1363,7 @@ Py_INCREF(o_format); Py_XDECREF(soself->s_format); soself->s_format = o_format; - + ret = prepare_s(soself); return ret; } @@ -1432,7 +1432,7 @@ { PyStructObject *soself = (PyStructObject *)self; assert(PyStruct_Check(self)); - assert(soself->s_codes != NULL); + assert(soself->s_codes != NULL); if (inputstr == NULL || !PyString_Check(inputstr) || PyString_GET_SIZE(inputstr) != soself->s_size) { PyErr_Format(StructError, @@ -1474,7 +1474,7 @@ "unpack_from requires a buffer argument"); return NULL; } - + if (offset < 0) offset += buffer_len; @@ -1548,7 +1548,7 @@ } } } - + /* Success */ return 0; } @@ -1577,12 +1577,12 @@ "pack requires exactly %zd arguments", soself->s_len); return NULL; } - + /* Allocate a new string */ result = PyString_FromStringAndSize((char *)NULL, soself->s_size); if (result == NULL) return NULL; - + /* Call the guts */ if ( s_pack_internal(soself, args, 0, PyString_AS_STRING(result)) != 0 ) { Py_DECREF(result); @@ -1615,14 +1615,14 @@ PyTuple_GET_SIZE(args) != (soself->s_len + 2)) { PyErr_Format(StructError, - "pack_to requires exactly %zd arguments", + "pack_to requires exactly %zd arguments", (soself->s_len + 2)); return NULL; } /* Extract a writable memory buffer from the first argument */ - if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0), - (void**)&buffer, &buffer_len) == -1 ) { + if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0), + (void**)&buffer, &buffer_len) == -1 ) { return NULL; } assert( buffer_len >= 0 ); @@ -1641,7 +1641,7 @@ soself->s_size); return NULL; } - + /* Call the guts */ if ( s_pack_internal(soself, args, 2, buffer + offset) != 0 ) { return NULL; @@ -1667,7 +1667,7 @@ static struct PyMethodDef s_methods[] = { {"pack", (PyCFunction)s_pack, METH_VARARGS, s_pack__doc__}, - {"pack_to", (PyCFunction)s_pack_to, METH_VARARGS, s_pack_to__doc__}, + {"pack_to", (PyCFunction)s_pack_to, METH_VARARGS, s_pack_to__doc__}, {"unpack", (PyCFunction)s_unpack, METH_O, s_unpack__doc__}, {"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS, s_unpack_from__doc__}, {NULL, NULL} /* sentinel */ @@ -1756,10 +1756,10 @@ return; } -#else +#else /* This speed trick can't be used until overflow masking goes away, because native endian always raises exceptions instead of overflow masking. */ - + /* Check endian and swap in faster functions */ { int one = 1; @@ -1781,7 +1781,7 @@ listed in the same order */ if (ptr == other) other++; - /* Only use the trick if the + /* Only use the trick if the size matches */ if (ptr->size != native->size) break; @@ -1799,7 +1799,7 @@ } } #endif - + /* Add some symbolic constants to the module */ if (StructError == NULL) { StructError = PyErr_NewException("struct.error", NULL, NULL); @@ -1812,7 +1812,7 @@ Py_INCREF((PyObject*)&PyStructType); PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType); - + PyModule_AddIntConstant(m, "_PY_STRUCT_RANGE_CHECKING", 1); #ifdef PY_STRUCT_OVERFLOW_MASKING PyModule_AddIntConstant(m, "_PY_STRUCT_OVERFLOW_MASKING", 1);

1 0

r46579 - python/trunk/Doc/whatsnew/whatsnew25.tex
by andrew.kuchling May 31, 2006

May 31, 2006

Author: andrew.kuchling Date: Wed May 31 16:12:47 2006 New Revision: 46579 Modified: python/trunk/Doc/whatsnew/whatsnew25.tex Log: Mention SimpleXMLRPCServer change Modified: python/trunk/Doc/whatsnew/whatsnew25.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew25.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew25.tex Wed May 31 16:12:47 2006 @@ -1508,6 +1508,14 @@ (Patch from Robert Kiendl.) % Patch #1472854 +\item The \module{SimpleXMLRPCServer} and \module{DocXMLRPCServer} +classes now have a \member{rpc_paths} attribute that constrains +XML-RPC operations to a limited set of URL paths; the default is +to allow only \code{'/'} and \code{'/RPC2'}. Setting +\member{rpc_paths} to \code{None} or an empty tuple disables +this path checking. +% Bug #1473048 + \item The \module{socket} module now supports \constant{AF_NETLINK} sockets on Linux, thanks to a patch from Philippe Biondi. Netlink sockets are a Linux-specific mechanism for communications @@ -2163,6 +2171,13 @@ arguments instead. The modules also no longer accept the deprecated \var{bin} keyword parameter. +\item Library: The \module{SimpleXMLRPCServer} and \module{DocXMLRPCServer} +classes now have a \member{rpc_paths} attribute that constrains +XML-RPC operations to a limited set of URL paths; the default is +to allow only \code{'/'} and \code{'/RPC2'}. Setting +\member{rpc_paths} to \code{None} or an empty tuple disables +this path checking. + \item C API: Many functions now use \ctype{Py_ssize_t} instead of \ctype{int} to allow processing more data on 64-bit machines. Extension code may need to make the same change to avoid

1 0

r46578 - in python/trunk: Doc/lib/libsimplexmlrpc.tex Lib/DocXMLRPCServer.py Lib/SimpleXMLRPCServer.py
by andrew.kuchling May 31, 2006

May 31, 2006

Author: andrew.kuchling Date: Wed May 31 16:08:48 2006 New Revision: 46578 Modified: python/trunk/Doc/lib/libsimplexmlrpc.tex python/trunk/Lib/DocXMLRPCServer.py python/trunk/Lib/SimpleXMLRPCServer.py Log: [Bug #1473048] SimpleXMLRPCServer and DocXMLRPCServer don't look at the path of the HTTP request at all; you can POST or GET from / or /RPC2 or /blahblahblah with the same results. Security scanners that look for /cgi-bin/phf will therefore report lots of vulnerabilities. Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class, and report a 404 error if the path isn't on the allowed list. Possibly-controversial aspect of this change: the default makes only '/' and '/RPC2' legal. Maybe this will break people's applications (though I doubt it). We could just set the default to an empty tuple, which would exactly match the current behaviour. Modified: python/trunk/Doc/lib/libsimplexmlrpc.tex ============================================================================== --- python/trunk/Doc/lib/libsimplexmlrpc.tex (original) +++ python/trunk/Doc/lib/libsimplexmlrpc.tex Wed May 31 16:08:48 2006 @@ -111,6 +111,15 @@ Registers the XML-RPC multicall function system.multicall. \end{methoddesc} +\begin{memberdesc}[SimpleXMLRPCServer]{rpc_paths} +An attribute value that must be a tuple listing valid path portions of +the URL for receiving XML-RPC requests. Requests posted to other +paths will result in a 404 ``no such page'' HTTP error. If this +tuple is empty, all paths will be considered valid. +The default value is \code{('/', '/RPC2')}. + \versionadded{2.5} +\end{memberdesc} + Example: \begin{verbatim} Modified: python/trunk/Lib/DocXMLRPCServer.py ============================================================================== --- python/trunk/Lib/DocXMLRPCServer.py (original) +++ python/trunk/Lib/DocXMLRPCServer.py Wed May 31 16:08:48 2006 @@ -227,6 +227,10 @@ Interpret all HTTP GET requests as requests for server documentation. """ + # Check that the path is legal + if not self.is_rpc_path_valid(): + self.report_404() + return response = self.server.generate_html_documentation() self.send_response(200) Modified: python/trunk/Lib/SimpleXMLRPCServer.py ============================================================================== --- python/trunk/Lib/SimpleXMLRPCServer.py (original) +++ python/trunk/Lib/SimpleXMLRPCServer.py Wed May 31 16:08:48 2006 @@ -423,6 +423,17 @@ XML-RPC requests. """ + # Class attribute listing the accessible path components; + # paths not on this list will result in a 404 error. + rpc_paths = ('/', '/RPC2') + + def is_rpc_path_valid(self): + if self.rpc_paths: + return self.path in self.rpc_paths + else: + # If .rpc_paths is empty, just assume all paths are legal + return True + def do_POST(self): """Handles the HTTP POST request. @@ -430,6 +441,11 @@ which are forwarded to the server's _dispatch method for handling. """ + # Check that the path is legal + if not self.is_rpc_path_valid(): + self.report_404() + return + try: # Get arguments by reading body of request. # We read this in chunks to avoid straining @@ -468,6 +484,18 @@ self.wfile.flush() self.connection.shutdown(1) + def report_404 (self): + # Report a 404 error + self.send_response(404) + response = 'No such page' + self.send_header("Content-type", "text/plain") + self.send_header("Content-length", str(len(response))) + self.end_headers() + self.wfile.write(response) + # shut down the connection + self.wfile.flush() + self.connection.shutdown(1) + def log_request(self, code='-', size='-'): """Selectively log an accepted request."""

1 0

buildbot warnings in x86 XP-2 trunk
by buildbot＠python.org May 31, 2006

May 31, 2006

The Buildbot has detected a new failure of x86 XP-2 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP-2%2520trunk/builds/522 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: andrew.kuchling Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r46577 - python/trunk/PCbuild8/make_versioninfo.vcproj python/trunk/PCbuild8/pcbuild.sln python/trunk/PCbuild8/pythoncore.vcproj python/trunk/PCbuild8/pythoncore_link.txt python/trunk/PCbuild8/pythoncore_pgo.vcproj python/trunk/PCbuild8/pythoncore_pgo_link.txt
by kristjan.jonsson May 31, 2006

May 31, 2006

Author: kristjan.jonsson Date: Wed May 31 15:35:41 2006 New Revision: 46577 Removed: python/trunk/PCbuild8/pythoncore_link.txt Modified: python/trunk/PCbuild8/make_versioninfo.vcproj python/trunk/PCbuild8/pcbuild.sln python/trunk/PCbuild8/pythoncore.vcproj python/trunk/PCbuild8/pythoncore_pgo.vcproj python/trunk/PCbuild8/pythoncore_pgo_link.txt Log: Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation Modified: python/trunk/PCbuild8/make_versioninfo.vcproj ============================================================================== --- python/trunk/PCbuild8/make_versioninfo.vcproj (original) +++ python/trunk/PCbuild8/make_versioninfo.vcproj Wed May 31 15:35:41 2006 @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="8,00" Name="make_versioninfo" ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" RootNamespace="make_versioninfo" - SccProjectName="make_versioninfo" - SccLocalPath=".." - SccProvider="MSSCCI:Perforce SCM" > <Platforms> <Platform Modified: python/trunk/PCbuild8/pcbuild.sln ============================================================================== --- python/trunk/PCbuild8/pcbuild.sln (original) +++ python/trunk/PCbuild8/pcbuild.sln Wed May 31 15:35:41 2006 @@ -3,6 +3,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" ProjectSection(ProjectDependencies) = postProject {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} + {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" @@ -61,9 +62,14 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore_pgo", "pythoncore_pgo.vcproj", "{8B59C1FF-2439-4BE9-9F24-84D4982D28D4}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -178,6 +184,14 @@ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: python/trunk/PCbuild8/pythoncore.vcproj ============================================================================== --- python/trunk/PCbuild8/pythoncore.vcproj (original) +++ python/trunk/PCbuild8/pythoncore.vcproj Wed May 31 15:35:41 2006 @@ -522,6 +522,10 @@ > </File> <File + RelativePath="..\Modules\_functoolsmodule.c" + > + </File> + <File RelativePath="..\Modules\_heapqmodule.c" > </File> @@ -690,7 +694,7 @@ > </File> <File - RelativePath="..\Python\exceptions.c" + RelativePath="..\Objects\exceptions.c" > </File> <File @@ -718,14 +722,6 @@ > </File> <File - RelativePath="..\Modules\functionalmodule.c" - > - </File> - <File - RelativePath="..\Modules\functionalmodule.c" - > - </File> - <File RelativePath="..\Python\future.c" > </File> Deleted: /python/trunk/PCbuild8/pythoncore_link.txt ============================================================================== --- /python/trunk/PCbuild8/pythoncore_link.txt Wed May 31 15:35:41 2006 +++ (empty file) @@ -1,311 +0,0 @@ -/OUT:"./python25.dll" /INCREMENTAL:NO /DLL /MANIFEST /MANIFESTFILE:".\x86-temp-release\pythoncore\python25.dll.intermediate.manifest" /NODEFAULTLIB:"libc" /DEBUG /PDB:".\./python25.pdb" /SUBSYSTEM:WINDOWS /LTCG:PGINSTRUMENT /PGD:"c:\pydev\PCbuild\python25.pgd" /BASE:"0x1e000000" /IMPLIB:".\./python25.lib" /MACHINE:X86 getbuildinfo.o kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib - -".\x86-temp-release\pythoncore\adler32.obj" - -".\x86-temp-release\pythoncore\compress.obj" - -".\x86-temp-release\pythoncore\crc32.obj" - -".\x86-temp-release\pythoncore\deflate.obj" - -".\x86-temp-release\pythoncore\gzio.obj" - -".\x86-temp-release\pythoncore\infback.obj" - -".\x86-temp-release\pythoncore\inffast.obj" - -".\x86-temp-release\pythoncore\inflate.obj" - -".\x86-temp-release\pythoncore\inftrees.obj" - -".\x86-temp-release\pythoncore\trees.obj" - -".\x86-temp-release\pythoncore\uncompr.obj" - -".\x86-temp-release\pythoncore\zlibmodule.obj" - -".\x86-temp-release\pythoncore\zutil.obj" - -".\x86-temp-release\pythoncore\_bisectmodule.obj" - -".\x86-temp-release\pythoncore\_codecs_cn.obj" - -".\x86-temp-release\pythoncore\_codecs_hk.obj" - -".\x86-temp-release\pythoncore\_codecs_iso2022.obj" - -".\x86-temp-release\pythoncore\_codecs_jp.obj" - -".\x86-temp-release\pythoncore\_codecs_kr.obj" - -".\x86-temp-release\pythoncore\_codecs_tw.obj" - -".\x86-temp-release\pythoncore\_codecsmodule.obj" - -".\x86-temp-release\pythoncore\_csv.obj" - -".\x86-temp-release\pythoncore\_heapqmodule.obj" - -".\x86-temp-release\pythoncore\_hotshot.obj" - -".\x86-temp-release\pythoncore\_localemodule.obj" - -".\x86-temp-release\pythoncore\_lsprof.obj" - -".\x86-temp-release\pythoncore\_randommodule.obj" - -".\x86-temp-release\pythoncore\_sre.obj" - -".\x86-temp-release\pythoncore\_subprocess.obj" - -".\x86-temp-release\pythoncore\_weakref.obj" - -".\x86-temp-release\pythoncore\_winreg.obj" - -".\x86-temp-release\pythoncore\abstract.obj" - -".\x86-temp-release\pythoncore\acceler.obj" - -".\x86-temp-release\pythoncore\arraymodule.obj" - -".\x86-temp-release\pythoncore\asdl.obj" - -".\x86-temp-release\pythoncore\ast.obj" - -".\x86-temp-release\pythoncore\audioop.obj" - -".\x86-temp-release\pythoncore\binascii.obj" - -".\x86-temp-release\pythoncore\bitset.obj" - -".\x86-temp-release\pythoncore\bltinmodule.obj" - -".\x86-temp-release\pythoncore\boolobject.obj" - -".\x86-temp-release\pythoncore\bufferobject.obj" - -".\x86-temp-release\pythoncore\cellobject.obj" - -".\x86-temp-release\pythoncore\ceval.obj" - -".\x86-temp-release\pythoncore\classobject.obj" - -".\x86-temp-release\pythoncore\cmathmodule.obj" - -".\x86-temp-release\pythoncore\cobject.obj" - -".\x86-temp-release\pythoncore\codecs.obj" - -".\x86-temp-release\pythoncore\codeobject.obj" - -".\x86-temp-release\pythoncore\collectionsmodule.obj" - -".\x86-temp-release\pythoncore\compile.obj" - -".\x86-temp-release\pythoncore\complexobject.obj" - -".\x86-temp-release\pythoncore\config.obj" - -".\x86-temp-release\pythoncore\cPickle.obj" - -".\x86-temp-release\pythoncore\cStringIO.obj" - -".\x86-temp-release\pythoncore\datetimemodule.obj" - -".\x86-temp-release\pythoncore\descrobject.obj" - -".\x86-temp-release\pythoncore\dictobject.obj" - -".\x86-temp-release\pythoncore\dl_nt.obj" - -".\x86-temp-release\pythoncore\dynload_win.obj" - -".\x86-temp-release\pythoncore\enumobject.obj" - -".\x86-temp-release\pythoncore\errnomodule.obj" - -".\x86-temp-release\pythoncore\errors.obj" - -".\x86-temp-release\pythoncore\exceptions.obj" - -".\x86-temp-release\pythoncore\fileobject.obj" - -".\x86-temp-release\pythoncore\firstsets.obj" - -".\x86-temp-release\pythoncore\floatobject.obj" - -".\x86-temp-release\pythoncore\frameobject.obj" - -".\x86-temp-release\pythoncore\frozen.obj" - -".\x86-temp-release\pythoncore\funcobject.obj" - -".\x86-temp-release\pythoncore\functionalmodule.obj" - -".\x86-temp-release\pythoncore\future.obj" - -".\x86-temp-release\pythoncore\gcmodule.obj" - -".\x86-temp-release\pythoncore\genobject.obj" - -".\x86-temp-release\pythoncore\getargs.obj" - -".\x86-temp-release\pythoncore\getcompiler.obj" - -".\x86-temp-release\pythoncore\getcopyright.obj" - -".\x86-temp-release\pythoncore\getmtime.obj" - -".\x86-temp-release\pythoncore\getopt.obj" - -".\x86-temp-release\pythoncore\getpathp.obj" - -".\x86-temp-release\pythoncore\getplatform.obj" - -".\x86-temp-release\pythoncore\getversion.obj" - -".\x86-temp-release\pythoncore\graminit.obj" - -".\x86-temp-release\pythoncore\grammar.obj" - -".\x86-temp-release\pythoncore\grammar1.obj" - -".\x86-temp-release\pythoncore\imageop.obj" - -".\x86-temp-release\pythoncore\import.obj" - -".\x86-temp-release\pythoncore\import_nt.obj" - -".\x86-temp-release\pythoncore\importdl.obj" - -".\x86-temp-release\pythoncore\intobject.obj" - -".\x86-temp-release\pythoncore\iterobject.obj" - -".\x86-temp-release\pythoncore\itertoolsmodule.obj" - -".\x86-temp-release\pythoncore\listnode.obj" - -".\x86-temp-release\pythoncore\listobject.obj" - -".\x86-temp-release\pythoncore\longobject.obj" - -".\x86-temp-release\pythoncore\main.obj" - -".\x86-temp-release\pythoncore\marshal.obj" - -".\x86-temp-release\pythoncore\mathmodule.obj" - -".\x86-temp-release\pythoncore\md5.obj" - -".\x86-temp-release\pythoncore\md5module.obj" - -".\x86-temp-release\pythoncore\metagrammar.obj" - -".\x86-temp-release\pythoncore\methodobject.obj" - -".\x86-temp-release\pythoncore\mmapmodule.obj" - -".\x86-temp-release\pythoncore\modsupport.obj" - -".\x86-temp-release\pythoncore\moduleobject.obj" - -".\x86-temp-release\pythoncore\msvcrtmodule.obj" - -".\x86-temp-release\pythoncore\multibytecodec.obj" - -".\x86-temp-release\pythoncore\myreadline.obj" - -".\x86-temp-release\pythoncore\mysnprintf.obj" - -".\x86-temp-release\pythoncore\mystrtoul.obj" - -".\x86-temp-release\pythoncore\node.obj" - -".\x86-temp-release\pythoncore\object.obj" - -".\x86-temp-release\pythoncore\obmalloc.obj" - -".\x86-temp-release\pythoncore\operator.obj" - -".\x86-temp-release\pythoncore\parser.obj" - -".\x86-temp-release\pythoncore\parsermodule.obj" - -".\x86-temp-release\pythoncore\parsetok.obj" - -".\x86-temp-release\pythoncore\posixmodule.obj" - -".\x86-temp-release\pythoncore\pyarena.obj" - -".\x86-temp-release\pythoncore\pyfpe.obj" - -".\x86-temp-release\pythoncore\pystate.obj" - -".\x86-temp-release\pythoncore\pystrtod.obj" - -".\x86-temp-release\pythoncore\Python-ast.obj" - -".\x86-temp-release\pythoncore\python_nt.res" - -".\x86-temp-release\pythoncore\pythonrun.obj" - -".\x86-temp-release\pythoncore\rangeobject.obj" - -".\x86-temp-release\pythoncore\rgbimgmodule.obj" - -".\x86-temp-release\pythoncore\rotatingtree.obj" - -".\x86-temp-release\pythoncore\setobject.obj" - -".\x86-temp-release\pythoncore\sha256module.obj" - -".\x86-temp-release\pythoncore\sha512module.obj" - -".\x86-temp-release\pythoncore\shamodule.obj" - -".\x86-temp-release\pythoncore\signalmodule.obj" - -".\x86-temp-release\pythoncore\sliceobject.obj" - -".\x86-temp-release\pythoncore\stringobject.obj" - -".\x86-temp-release\pythoncore\stropmodule.obj" - -".\x86-temp-release\pythoncore\structmember.obj" - -".\x86-temp-release\pythoncore\_struct.obj" - -".\x86-temp-release\pythoncore\structseq.obj" - -".\x86-temp-release\pythoncore\symtable.obj" - -".\x86-temp-release\pythoncore\symtablemodule.obj" - -".\x86-temp-release\pythoncore\sysmodule.obj" - -".\x86-temp-release\pythoncore\thread.obj" - -".\x86-temp-release\pythoncore\threadmodule.obj" - -".\x86-temp-release\pythoncore\timemodule.obj" - -".\x86-temp-release\pythoncore\tokenizer.obj" - -".\x86-temp-release\pythoncore\traceback.obj" - -".\x86-temp-release\pythoncore\tupleobject.obj" - -".\x86-temp-release\pythoncore\typeobject.obj" - -".\x86-temp-release\pythoncore\unicodectype.obj" - -".\x86-temp-release\pythoncore\unicodeobject.obj" - -".\x86-temp-release\pythoncore\weakrefobject.obj" - -".\x86-temp-release\pythoncore\xxsubtype.obj" - -".\x86-temp-release\pythoncore\yuvconvert.obj" - -".\x86-temp-release\pythoncore\zipimport.obj" \ No newline at end of file Modified: python/trunk/PCbuild8/pythoncore_pgo.vcproj ============================================================================== --- python/trunk/PCbuild8/pythoncore_pgo.vcproj (original) +++ python/trunk/PCbuild8/pythoncore_pgo.vcproj Wed May 31 15:35:41 2006 @@ -68,7 +68,7 @@ <Tool Name="VCPreLinkEventTool" Description="Generate buildinfo & profile guided optimizations (please be patient)" - CommandLine="make_buildinfo.exe $(ConfigurationName)
link @$(ProjectName)_link.txt
$(OutDir)\python ../Tools/pybench/pybench.py -n 1" + CommandLine="make_buildinfo.exe $(ConfigurationName)
link @$(ProjectName)_link.txt
$(OutDir)\python ../Tools/pybench/pybench.py -n 1
" /> <Tool Name="VCLinkerTool" @@ -215,6 +215,10 @@ > </File> <File + RelativePath="..\Modules\_functoolsmodule.c" + > + </File> + <File RelativePath="..\Modules\_heapqmodule.c" > </File> @@ -383,7 +387,7 @@ > </File> <File - RelativePath="..\Python\exceptions.c" + RelativePath="..\Objects\exceptions.c" > </File> <File @@ -411,10 +415,6 @@ > </File> <File - RelativePath="..\Modules\functionalmodule.c" - > - </File> - <File RelativePath="..\Python\future.c" > </File> @@ -638,7 +638,7 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="xcopy $(InputFileName)* $(OutDir) /F /I /Y" + CommandLine="xcopy $(InputFileName)* $(OutDir) /F /I /Y
" Outputs="$(OutDir)\$(InputFileName)" /> </FileConfiguration> Modified: python/trunk/PCbuild8/pythoncore_pgo_link.txt ============================================================================== --- python/trunk/PCbuild8/pythoncore_pgo_link.txt (original) +++ python/trunk/PCbuild8/pythoncore_pgo_link.txt Wed May 31 15:35:41 2006 @@ -1,4 +1,4 @@ -/OUT:".\pythoncore_pgo/python25.dll" /INCREMENTAL:NO /DLL /MANIFEST /MANIFESTFILE:".\x86-temp-release\pythoncore_pgo\python25.dll.intermediate.manifest" /NODEFAULTLIB:"libc" /DEBUG /PDB:".\pythoncore_pgo/python25.pdb" /SUBSYSTEM:WINDOWS /LTCG:PGINSTRUMENT /PGD:"c:\pydev\PCbuild\pythoncore_pgo\python25.pgd" /BASE:"0x1e000000" /IMPLIB:"pythoncore_pgo/python25.lib" /MACHINE:X86 getbuildinfo.o kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib +/OUT:".\pythoncore_pgo/python25.dll" /INCREMENTAL:NO /DLL /MANIFEST /MANIFESTFILE:".\x86-temp-release\pythoncore_pgo\python25.dll.intermediate.manifest" /NODEFAULTLIB:"libc" /DEBUG /PDB:".\pythoncore_pgo/python25.pdb" /SUBSYSTEM:WINDOWS /LTCG:PGINSTRUMENT /PGD:".\pythoncore_pgo\python25.pgd" /BASE:"0x1e000000" /IMPLIB:"pythoncore_pgo/python25.lib" /MACHINE:X86 getbuildinfo.o kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ".\x86-temp-release\pythoncore_pgo\adler32.obj" @@ -44,6 +44,8 @@ ".\x86-temp-release\pythoncore_pgo\_csv.obj" +".\x86-temp-release\pythoncore_pgo\_functoolsmodule.obj" + ".\x86-temp-release\pythoncore_pgo\_heapqmodule.obj" ".\x86-temp-release\pythoncore_pgo\_hotshot.obj" @@ -142,8 +144,6 @@ ".\x86-temp-release\pythoncore_pgo\funcobject.obj" -".\x86-temp-release\pythoncore_pgo\functionalmodule.obj" - ".\x86-temp-release\pythoncore_pgo\future.obj" ".\x86-temp-release\pythoncore_pgo\gcmodule.obj"

1 0

buildbot warnings in hppa Ubuntu dapper trunk
by buildbot＠python.org May 31, 2006

May 31, 2006

The Buildbot has detected a new failure of hppa Ubuntu dapper trunk. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%2520trunk… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: andrew.kuchling Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

buildbot warnings in alpha Debian trunk
by buildbot＠python.org May 31, 2006

May 31, 2006

The Buildbot has detected a new failure of alpha Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Debian%2520trunk/builds/253 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: thomas.heller Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r46576 - python/trunk/Doc/whatsnew/whatsnew25.tex
by andrew.kuchling May 31, 2006

May 31, 2006

Author: andrew.kuchling Date: Wed May 31 15:18:56 2006 New Revision: 46576 Modified: python/trunk/Doc/whatsnew/whatsnew25.tex Log: 'functional' module was renamed to 'functools' Modified: python/trunk/Doc/whatsnew/whatsnew25.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew25.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew25.tex Wed May 31 15:18:56 2006 @@ -125,7 +125,7 @@ %====================================================================== \section{PEP 309: Partial Function Application\label{pep-309}} -The \module{functional} module is intended to contain tools for +The \module{functools} module is intended to contain tools for functional-style programming. Currently it only contains a \class{partial()} function, but new functions will probably be added in future versions of Python. @@ -136,7 +136,7 @@ you could create a new function \code{g(b, c)} that was equivalent to \code{f(1, b, c)}. This is called ``partial function application'', and is provided by the \class{partial} class in the new -\module{functional} module. +\module{functools} module. The constructor for \class{partial} takes the arguments \code{(\var{function}, \var{arg1}, \var{arg2}, ... @@ -147,18 +147,18 @@ Here's a small but realistic example: \begin{verbatim} -import functional +import functools def log (message, subsystem): "Write the contents of 'message' to the specified subsystem." print '%s: %s' % (subsystem, message) ... -server_log = functional.partial(log, subsystem='server') +server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') \end{verbatim} -Here's another example, from a program that uses PyGTk. Here a +Here's another example, from a program that uses PyGTK. Here a context-sensitive pop-up menu is being constructed dynamically. The callback provided for the menu option is a partially applied version of the \method{open_item()} method, where the first argument has been @@ -170,7 +170,7 @@ def open_item(self, path): ... def init (self): - open_func = functional.partial(self.open_item, item_path) + open_func = functools.partial(self.open_item, item_path) popup_menu.append( ("Open", open_func, 1) ) \end{verbatim}

1 0

r46575 - python/trunk/Modules/_ctypes/_ctypes.c
by thomas.heller May 31, 2006

May 31, 2006

Author: thomas.heller Date: Wed May 31 13:37:58 2006 New Revision: 46575 Modified: python/trunk/Modules/_ctypes/_ctypes.c Log: PyTuple_Pack is not available in Python 2.3, but ctypes must stay compatible with that. Modified: python/trunk/Modules/_ctypes/_ctypes.c ============================================================================== --- python/trunk/Modules/_ctypes/_ctypes.c (original) +++ python/trunk/Modules/_ctypes/_ctypes.c Wed May 31 13:37:58 2006 @@ -2185,7 +2185,7 @@ only it's object list. So we create a tuple, containing b_objects list PLUS the array itself, and return that! */ - return PyTuple_Pack(2, keep, value); + return Py_BuildValue("(OO)", keep, value); } PyErr_Format(PyExc_TypeError, "incompatible types, %s instance instead of %s instance",

1 0