[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31617] trunk/lib/win64: Update Python lib and headers to 3.1.2, built from official released sources.

Nathan Letwory nathan at letworyinteractive.com
Fri Aug 27 23:40:57 CEST 2010 

Revision: 31617
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31617
Author:   jesterking
Date:     2010-08-27 23:40:57 +0200 (Fri, 27 Aug 2010)

Log Message:
-----------
Update Python lib and headers to 3.1.2, built from official released sources.
Clean up old versions.

Note: xmlrpc/client.py has small fix: comment out lines 1181-1183 to ensure HTTPS transport for XMLRPC works.

Modified Paths:
--------------
    trunk/lib/win64/python/include/python3.1/abstract.h
    trunk/lib/win64/python/include/python3.1/bytearrayobject.h
    trunk/lib/win64/python/include/python3.1/code.h
    trunk/lib/win64/python/include/python3.1/descrobject.h
    trunk/lib/win64/python/include/python3.1/import.h
    trunk/lib/win64/python/include/python3.1/longintrepr.h
    trunk/lib/win64/python/include/python3.1/patchlevel.h
    trunk/lib/win64/python/include/python3.1/py_curses.h
    trunk/lib/win64/python/include/python3.1/pyconfig.h
    trunk/lib/win64/python/include/python3.1/pymacconfig.h
    trunk/lib/win64/python/include/python3.1/pymath.h
    trunk/lib/win64/python/include/python3.1/pymem.h
    trunk/lib/win64/python/include/python3.1/pyport.h
    trunk/lib/win64/python/include/python3.1/pystate.h
    trunk/lib/win64/python/include/python3.1/pythonrun.h
    trunk/lib/win64/python/lib/python31.dll
    trunk/lib/win64/python/lib/python31.lib
    trunk/lib/win64/python/lib/python31_d.dll
    trunk/lib/win64/python/lib/python31_d.lib
    trunk/lib/win64/python/lib/python31_d.pdb
    trunk/lib/win64/release/python31.zip

Added Paths:
-----------
    trunk/lib/win64/release/python31_d.zip

Removed Paths:
-------------
    trunk/lib/win64/python/include/python2.5/
    trunk/lib/win64/python/include/python2.6/
    trunk/lib/win64/python/include/python3.0/
    trunk/lib/win64/python/lib/python25.dll
    trunk/lib/win64/python/lib/python25.lib
    trunk/lib/win64/python/lib/python25_d.dll
    trunk/lib/win64/python/lib/python25_d.lib
    trunk/lib/win64/python/lib/python25_d.pdb
    trunk/lib/win64/python/lib/python26.dll
    trunk/lib/win64/python/lib/python26.lib
    trunk/lib/win64/python/lib/python26_d.dll
    trunk/lib/win64/python/lib/python26_d.lib
    trunk/lib/win64/python/lib/python26_d.pdb
    trunk/lib/win64/python/lib/python30.dll
    trunk/lib/win64/python/lib/python30.lib
    trunk/lib/win64/python/lib/python30_d.dll
    trunk/lib/win64/python/lib/python30_d.lib
    trunk/lib/win64/python/lib/python30_d.pdb
    trunk/lib/win64/release/python26.zip
    trunk/lib/win64/release/zlib.pyd

Modified: trunk/lib/win64/python/include/python3.1/abstract.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/abstract.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/abstract.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -777,12 +777,6 @@
         is cleared and the value is clipped. 
        */
 
-       /*
-         PyNumber_Int used to be found here.  It's now in Include/intobject.h,
-         where it is defined to be an alias for PyNumber_Long.  New code
-         should use PyNumber_Long instead.
-       */
-
      PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
 
        /*

Modified: trunk/lib/win64/python/include/python3.1/bytearrayobject.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/bytearrayobject.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/bytearrayobject.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -44,9 +44,13 @@
 PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
 
 /* Macros, trading safety for speed */
-#define PyByteArray_AS_STRING(self) (assert(PyByteArray_Check(self)),((PyByteArrayObject *)(self))->ob_bytes)
+#define PyByteArray_AS_STRING(self) \
+    (assert(PyByteArray_Check(self)), \
+     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string)
 #define PyByteArray_GET_SIZE(self)  (assert(PyByteArray_Check(self)),Py_SIZE(self))
 
+PyAPI_DATA(char) _PyByteArray_empty_string[];
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/lib/win64/python/include/python3.1/code.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/code.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/code.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -42,15 +42,15 @@
 */
 #define CO_NOFREE       0x0040
 
+/* These are no longer used. */
 #if 0
-/* These are no longer used. */
 #define CO_GENERATOR_ALLOWED    0x1000
+#endif
 #define CO_FUTURE_DIVISION    	0x2000
 #define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
 #define CO_FUTURE_WITH_STATEMENT  0x8000
 #define CO_FUTURE_PRINT_FUNCTION  0x10000
 #define CO_FUTURE_UNICODE_LITERALS 0x20000
-#endif
 
 #define CO_FUTURE_BARRY_AS_BDFL  0x40000
 

Modified: trunk/lib/win64/python/include/python3.1/descrobject.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/descrobject.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/descrobject.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -73,8 +73,6 @@
 PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
 PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
 PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
 
 PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
 PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);

Modified: trunk/lib/win64/python/include/python3.1/import.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/import.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/import.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -27,6 +27,14 @@
 PyAPI_FUNC(void) PyImport_Cleanup(void);
 PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *);
 
+#ifdef WITH_THREAD
+PyAPI_FUNC(void) _PyImport_AcquireLock(void);
+PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
+#else
+#define _PyImport_AcquireLock()
+#define _PyImport_ReleaseLock() 1
+#endif
+
 PyAPI_FUNC(struct filedescr *) _PyImport_FindModule(
 	const char *, PyObject *, char *, size_t, FILE **, PyObject **);
 PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *);

Modified: trunk/lib/win64/python/include/python3.1/longintrepr.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/longintrepr.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/longintrepr.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -40,10 +40,6 @@
   platform.
 */
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #if PYLONG_BITS_IN_DIGIT == 30
 #if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T &&          \
       defined HAVE_INT64_T && defined HAVE_INT32_T)

Modified: trunk/lib/win64/python/include/python3.1/patchlevel.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/patchlevel.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/patchlevel.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -18,16 +18,16 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	1
-#define PY_MICRO_VERSION	0
+#define PY_MICRO_VERSION	2
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.1"
+#define PY_VERSION      	"3.1.2"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */
-#define PY_PATCHLEVEL_REVISION  "$Revision: 73572 $"
+#define PY_PATCHLEVEL_REVISION  "$Revision: 79147 $"
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
    Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */

Modified: trunk/lib/win64/python/include/python3.1/py_curses.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/py_curses.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/py_curses.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -10,8 +10,13 @@
 #ifdef	_BSD_WCHAR_T_DEFINED_
 #define _WCHAR_T
 #endif
-#endif
 
+/* the following define is necessary for OS X 10.6; without it, the
+   Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
+   can't get at the WINDOW flags field. */
+#define NCURSES_OPAQUE 0
+#endif /* __APPLE__ */
+
 #ifdef __FreeBSD__
 /*
 ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards

Modified: trunk/lib/win64/python/include/python3.1/pyconfig.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/pyconfig.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/pyconfig.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -320,7 +320,7 @@
 /* For an MSVC DLL, we can nominate the .lib files used by extensions */
 #ifdef MS_COREDLL
 #	ifndef Py_BUILD_CORE /* not building the core - must be an ext */
-#		if 0 //defined(_MSC_VER)
+#		if defined(_MSC_VER)
 			/* So MSVC users need not specify the .lib file in
 			their Makefile (other compilers are generally
 			taken care of by distutils.) */
@@ -647,6 +647,11 @@
 #define HAVE_WCSCOLL 1
 #endif
 
+/* Define to 1 if you have the `wcsxfrm' function. */
+#ifndef MS_WINCE
+#define HAVE_WCSXFRM 1
+#endif
+
 /* Define if you have the <dlfcn.h> header file.  */
 /* #undef HAVE_DLFCN_H */
 

Modified: trunk/lib/win64/python/include/python3.1/pymacconfig.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/pymacconfig.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/pymacconfig.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -20,8 +20,6 @@
 # undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
 # undef DOUBLE_IS_BIG_ENDIAN_IEEE754
 # undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-/* we don't ever need to play with the x87 control word on OS X/Intel, so just
-   pretend that we can't, to avoid problems on Intel+PPC builds */
 # undef HAVE_GCC_ASM_FOR_X87
 
 #    undef VA_LIST_IS_ARRAY
@@ -76,6 +74,10 @@
 #define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
 #endif /* __BIG_ENDIAN */
 
+#ifdef __i386__
+# define HAVE_GCC_ASM_FOR_X87
+#endif
+
 	/* 
 	 * The definition in pyconfig.h is only valid on the OS release
 	 * where configure ran on and not necessarily for all systems where

Modified: trunk/lib/win64/python/include/python3.1/pymath.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/pymath.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/pymath.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -3,10 +3,6 @@
 
 #include "pyconfig.h" /* include for defines */
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to mathematical
 functions and constants

Modified: trunk/lib/win64/python/include/python3.1/pymem.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/pymem.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/pymem.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -90,10 +90,10 @@
  */
 
 #define PyMem_New(type, n) \
-  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
 	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
 #define PyMem_NEW(type, n) \
-  ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
 	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
 
 /*
@@ -103,10 +103,10 @@
  * caller's memory error handler to not lose track of it.
  */
 #define PyMem_Resize(p, type, n) \
-  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
 	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
 #define PyMem_RESIZE(p, type, n) \
-  ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
 	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
 
 /* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used

Modified: trunk/lib/win64/python/include/python3.1/pyport.h
===================================================================
--- trunk/lib/win64/python/include/python3.1/pyport.h	2010-08-27 21:38:47 UTC (rev 31616)
+++ trunk/lib/win64/python/include/python3.1/pyport.h	2010-08-27 21:40:57 UTC (rev 31617)
@@ -3,6 +3,12 @@
 
 #include "pyconfig.h" /* include for defines */
 
+/* Some versions of HP-UX & Solaris need inttypes.h for int32_t,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list