[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61448] trunk/lib/ darwin-9.x.universal: OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1

jens verwiebe info at jensverwiebe.de
Mon Nov 24 18:56:56 CET 2014 

Revision: 61448
          https://developer.blender.org/rBL61448
Author:   jensverwiebe
Date:     2014-11-24 17:56:55 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h
    trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h
    trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a
    trunk/lib/darwin-9.x.universal/release/python_x86_64.zip

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -1021,7 +1021,7 @@
 
      PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
        /*
-     Returns the sequence, o, as a list, unless it's already a
+     Return the sequence, o, as a list, unless it's already a
      tuple or list.  Use PySequence_Fast_GET_ITEM to access the
      members of this list, and PySequence_Fast_GET_SIZE to get its length.
 

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -49,6 +49,10 @@
 PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
        const char *encoding
        );
+
+PyAPI_FUNC(int) _PyCodec_Forget(
+       const char *encoding
+       );
 #endif
 
 /* Codec registry encoding check API.

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -46,7 +46,7 @@
 PyAPI_DATA(PyTypeObject) PySortWrapper_Type;
 
 #define PyList_Check(op) \
-		PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
+    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
 #define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type)
 
 PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -265,7 +265,7 @@
 #define _PyGCHead_REFS(g) ((g)->gc.gc_refs >> _PyGC_REFS_SHIFT)
 #define _PyGCHead_SET_REFS(g, v) do { \
     (g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK) \
-        | (v << _PyGC_REFS_SHIFT); \
+        | (((size_t)(v)) << _PyGC_REFS_SHIFT);             \
     } while (0)
 #define _PyGCHead_DECREF(g) ((g)->gc.gc_refs -= 1 << _PyGC_REFS_SHIFT)
 

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	4
-#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.4.0"
+#define PY_VERSION      	"3.4.2"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -228,7 +228,7 @@
 #define HAVE_EXPM1 1
 
 /* Define to 1 if you have the `faccessat' function. */
-/* #undef HAVE_FACCESSAT */
+#define HAVE_FACCESSAT 1
 
 /* Define if you have the 'fchdir' function. */
 #define HAVE_FCHDIR 1
@@ -237,13 +237,13 @@
 #define HAVE_FCHMOD 1
 
 /* Define to 1 if you have the `fchmodat' function. */
-/* #undef HAVE_FCHMODAT */
+#define HAVE_FCHMODAT 1
 
 /* Define to 1 if you have the `fchown' function. */
 #define HAVE_FCHOWN 1
 
 /* Define to 1 if you have the `fchownat' function. */
-/* #undef HAVE_FCHOWNAT */
+#define HAVE_FCHOWNAT 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
@@ -252,7 +252,7 @@
 /* #undef HAVE_FDATASYNC */
 
 /* Define to 1 if you have the `fdopendir' function. */
-/* #undef HAVE_FDOPENDIR */
+#define HAVE_FDOPENDIR 1
 
 /* Define to 1 if you have the `fexecve' function. */
 /* #undef HAVE_FEXECVE */
@@ -279,7 +279,7 @@
 #define HAVE_FSEEKO 1
 
 /* Define to 1 if you have the `fstatat' function. */
-/* #undef HAVE_FSTATAT */
+#define HAVE_FSTATAT 1
 
 /* Define to 1 if you have the `fstatvfs' function. */
 #define HAVE_FSTATVFS 1
@@ -509,7 +509,7 @@
 #define HAVE_LINK 1
 
 /* Define to 1 if you have the `linkat' function. */
-/* #undef HAVE_LINKAT */
+#define HAVE_LINKAT 1
 
 /* Define to 1 if you have the <linux/can/bcm.h> header file. */
 /* #undef HAVE_LINUX_CAN_BCM_H */
@@ -563,7 +563,7 @@
 /* #undef HAVE_MEMRCHR */
 
 /* Define to 1 if you have the `mkdirat' function. */
-/* #undef HAVE_MKDIRAT */
+#define HAVE_MKDIRAT 1
 
 /* Define to 1 if you have the `mkfifo' function. */
 #define HAVE_MKFIFO 1
@@ -602,7 +602,7 @@
 #define HAVE_NICE 1
 
 /* Define to 1 if you have the `openat' function. */
-/* #undef HAVE_OPENAT */
+#define HAVE_OPENAT 1
 
 /* Define to 1 if you have the `openpty' function. */
 #define HAVE_OPENPTY 1
@@ -677,7 +677,7 @@
 #define HAVE_READLINK 1
 
 /* Define to 1 if you have the `readlinkat' function. */
-/* #undef HAVE_READLINKAT */
+#define HAVE_READLINKAT 1
 
 /* Define to 1 if you have the `readv' function. */
 #define HAVE_READV 1
@@ -686,7 +686,7 @@
 #define HAVE_REALPATH 1
 
 /* Define to 1 if you have the `renameat' function. */
-/* #undef HAVE_RENAMEAT */
+#define HAVE_RENAMEAT 1
 
 /* Define if you have readline 2.1 */
 #define HAVE_RL_CALLBACK 1
@@ -913,7 +913,7 @@
 #define HAVE_SYMLINK 1
 
 /* Define to 1 if you have the `symlinkat' function. */
-/* #undef HAVE_SYMLINKAT */
+#define HAVE_SYMLINKAT 1
 
 /* Define to 1 if you have the `sync' function. */
 #define HAVE_SYNC 1
@@ -1091,7 +1091,7 @@
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `unlinkat' function. */
-/* #undef HAVE_UNLINKAT */
+#define HAVE_UNLINKAT 1
 
 /* Define to 1 if you have the `unsetenv' function. */
 #define HAVE_UNSETENV 1

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -53,10 +53,19 @@
      (tv_end.tv_usec - tv_start.tv_usec) * 0.000001)
 
 #ifndef Py_LIMITED_API
+
+typedef enum {
+    /* Round towards zero. */
+    _PyTime_ROUND_DOWN=0,
+    /* Round away from zero. */
+    _PyTime_ROUND_UP
+} _PyTime_round_t;
+
 /* Convert a number of seconds, int or float, to time_t. */
 PyAPI_FUNC(int) _PyTime_ObjectToTime_t(
     PyObject *obj,
-    time_t *sec);
+    time_t *sec,
+    _PyTime_round_t);
 
 /* Convert a time_t to a PyLong. */
 PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
@@ -72,7 +81,8 @@
 PyAPI_FUNC(int) _PyTime_ObjectToTimeval(
     PyObject *obj,
     time_t *sec,
-    long *usec);
+    long *usec,
+    _PyTime_round_t);
 
 /* Convert a number of seconds, int or float, to a timespec structure.
    nsec is in the range [0; 999999999] and rounded towards zero.
@@ -80,7 +90,8 @@
 PyAPI_FUNC(int) _PyTime_ObjectToTimespec(
     PyObject *obj,
     time_t *sec,
-    long *nsec);
+    long *nsec,
+    _PyTime_round_t);
 #endif
 
 /* Dummy to force linking. */

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -33,6 +33,10 @@
 PyAPI_FUNC(void) PySys_AddXOption(const wchar_t *);
 PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 
+#ifndef Py_LIMITED_API
+PyAPI_DATA(size_t) _PySys_GetSizeOf(PyObject *);
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h	2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h	2014-11-24 17:56:55 UTC (rev 61448)
@@ -343,6 +343,9 @@
            the data pointer is filled out. The bit is redundant, and helps
            to minimize the test in PyUnicode_IS_READY(). */
         unsigned int ready:1;
+        /* Padding to ensure that PyUnicode_DATA() is always aligned to
+           4 bytes (see issue #19537 on m68k). */
+        unsigned int :24;
     } state;
     wchar_t *wstr;              /* wchar_t representation (null-terminated) */
 } PyASCIIObject;

Modified: trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/release/python_x86_64.zip
===================================================================
(Binary files differ)

More information about the Bf-blender-cvs mailing list