[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61633] trunk/lib/win64_vc12/python : MSVC 2013 windows x64 (vc120) Python 3.5.1
Martijn Berger
martijn.berger at gmail.com
Wed Feb 17 17:26:40 CET 2016
Revision: 61633
https://developer.blender.org/rBL61633
Author: juicyfruit
Date: 2016-02-17 16:26:39 +0000 (Wed, 17 Feb 2016)
Log Message:
-----------
MSVC 2013 windows x64 (vc120) Python 3.5.1
Modified Paths:
--------------
trunk/lib/win64_vc12/python/include/python3.5/Python-ast.h
trunk/lib/win64_vc12/python/include/python3.5/abstract.h
trunk/lib/win64_vc12/python/include/python3.5/ceval.h
trunk/lib/win64_vc12/python/include/python3.5/codecs.h
trunk/lib/win64_vc12/python/include/python3.5/dictobject.h
trunk/lib/win64_vc12/python/include/python3.5/object.h
trunk/lib/win64_vc12/python/include/python3.5/patchlevel.h
trunk/lib/win64_vc12/python/include/python3.5/pyatomic.h
trunk/lib/win64_vc12/python/include/python3.5/pystate.h
trunk/lib/win64_vc12/python/include/python3.5/pytime.h
trunk/lib/win64_vc12/python/include/python3.5/unicodeobject.h
trunk/lib/win64_vc12/python/lib/python35.dll
trunk/lib/win64_vc12/python/lib/python35.exp
trunk/lib/win64_vc12/python/lib/python35.lib
trunk/lib/win64_vc12/python/lib/python35_d.dll
trunk/lib/win64_vc12/python/lib/python35_d.exp
trunk/lib/win64_vc12/python/lib/python35_d.lib
Removed Paths:
-------------
trunk/lib/win64_vc12/python/lib/sqlite3.dll
trunk/lib/win64_vc12/python/lib/sqlite3_d.dll
Modified: trunk/lib/win64_vc12/python/include/python3.5/Python-ast.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/Python-ast.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/Python-ast.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -585,8 +585,9 @@
arguments_ty _Py_arguments(asdl_seq * args, arg_ty vararg, asdl_seq *
kwonlyargs, asdl_seq * kw_defaults, arg_ty kwarg,
asdl_seq * defaults, PyArena *arena);
-#define arg(a0, a1, a2) _Py_arg(a0, a1, a2)
-arg_ty _Py_arg(identifier arg, expr_ty annotation, PyArena *arena);
+#define arg(a0, a1, a2, a3, a4) _Py_arg(a0, a1, a2, a3, a4)
+arg_ty _Py_arg(identifier arg, expr_ty annotation, int lineno, int col_offset,
+ PyArena *arena);
#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
Modified: trunk/lib/win64_vc12/python/include/python3.5/abstract.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/abstract.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/abstract.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -95,7 +95,7 @@
numeric, sequence, and mapping. Each protocol consists of a
collection of related operations. If an operation that is not
provided by a particular type is invoked, then a standard exception,
- NotImplementedError is raised with a operation name as an argument.
+ NotImplementedError is raised with an operation name as an argument.
In addition, for convenience this interface defines a set of
constructors for building objects of built-in types. This is needed
so new objects can be returned from C functions that otherwise treat
Modified: trunk/lib/win64_vc12/python/include/python3.5/ceval.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/ceval.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/ceval.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -94,10 +94,16 @@
# define _Py_MakeRecCheck(x) (++(x) > _Py_CheckRecursionLimit)
#endif
+/* Compute the "lower-water mark" for a recursion limit. When
+ * Py_LeaveRecursiveCall() is called with a recursion depth below this mark,
+ * the overflowed flag is reset to 0. */
+#define _Py_RecursionLimitLowerWaterMark(limit) \
+ (((limit) > 200) \
+ ? ((limit) - 50) \
+ : (3 * ((limit) >> 2)))
+
#define _Py_MakeEndRecCheck(x) \
- (--(x) < ((_Py_CheckRecursionLimit > 100) \
- ? (_Py_CheckRecursionLimit - 50) \
- : (3 * (_Py_CheckRecursionLimit >> 2))))
+ (--(x) < _Py_RecursionLimitLowerWaterMark(_Py_CheckRecursionLimit))
#define Py_ALLOW_RECURSION \
do { unsigned char _old = PyThreadState_GET()->recursion_critical;\
Modified: trunk/lib/win64_vc12/python/include/python3.5/codecs.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/codecs.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/codecs.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -165,7 +165,7 @@
const char *encoding
);
-/* Get a IncrementalEncoder object for the given encoding. */
+/* Get an IncrementalEncoder object for the given encoding. */
PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder(
const char *encoding,
@@ -172,7 +172,7 @@
const char *errors
);
-/* Get a IncrementalDecoder object function for the given encoding. */
+/* Get an IncrementalDecoder object function for the given encoding. */
PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder(
const char *encoding,
Modified: trunk/lib/win64_vc12/python/include/python3.5/dictobject.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/dictobject.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/dictobject.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -72,6 +72,10 @@
PyObject *item, Py_hash_t hash);
#endif
PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key);
+#ifndef Py_LIMITED_API
+PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
+ Py_hash_t hash);
+#endif
PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
PyAPI_FUNC(int) PyDict_Next(
PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
Modified: trunk/lib/win64_vc12/python/include/python3.5/object.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/object.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/object.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -351,7 +351,8 @@
printfunc tp_print;
getattrfunc tp_getattr;
setattrfunc tp_setattr;
- PyAsyncMethods *tp_as_async; /* formerly known as tp_compare or tp_reserved */
+ PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
+ or tp_reserved (Python 3) */
reprfunc tp_repr;
/* Method suites for standard classes */
Modified: trunk/lib/win64_vc12/python/include/python3.5/patchlevel.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/patchlevel.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/patchlevel.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -18,12 +18,12 @@
/*--start constants--*/
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 5
-#define PY_MICRO_VERSION 0
+#define PY_MICRO_VERSION 1
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.5.0"
+#define PY_VERSION "3.5.1"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Modified: trunk/lib/win64_vc12/python/include/python3.5/pyatomic.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/pyatomic.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/pyatomic.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -1,8 +1,6 @@
-/* Issue #23644: <stdatomic.h> is incompatible with C++, see:
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 */
-#if !defined(Py_LIMITED_API) && !defined(__cplusplus)
#ifndef Py_ATOMIC_H
#define Py_ATOMIC_H
+#ifdef Py_BUILD_CORE
#include "dynamic_annotations.h"
@@ -248,5 +246,5 @@
#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
_Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed)
+#endif /* Py_BUILD_CORE */
#endif /* Py_ATOMIC_H */
-#endif /* Py_LIMITED_API */
Modified: trunk/lib/win64_vc12/python/include/python3.5/pystate.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/pystate.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/pystate.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -177,20 +177,13 @@
/* Variable and macro for in-line access to current thread state */
/* Assuming the current thread holds the GIL, this is the
- PyThreadState for the current thread.
-
- Issue #23644: pyatomic.h is incompatible with C++ (yet). Disable
- PyThreadState_GET() optimization: declare it as an alias to
- PyThreadState_Get(), as done for limited API. */
-#if !defined(Py_LIMITED_API) && !defined(__cplusplus)
+ PyThreadState for the current thread. */
+#ifdef Py_BUILD_CORE
PyAPI_DATA(_Py_atomic_address) _PyThreadState_Current;
-#endif
-
-#if defined(Py_DEBUG) || defined(Py_LIMITED_API) || defined(__cplusplus)
-#define PyThreadState_GET() PyThreadState_Get()
+# define PyThreadState_GET() \
+ ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current))
#else
-#define PyThreadState_GET() \
- ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current))
+# define PyThreadState_GET() PyThreadState_Get()
#endif
typedef
Modified: trunk/lib/win64_vc12/python/include/python3.5/pytime.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/pytime.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/pytime.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -117,6 +117,18 @@
struct timeval *tv,
_PyTime_round_t round);
+/* Convert a timestamp to a number of seconds (secs) and microseconds (us).
+ us is always positive. This function is similar to _PyTime_AsTimeval()
+ except that secs is always a time_t type, whereas the timeval structure
+ uses a C long for tv_sec on Windows.
+ Raise an exception and return -1 if the conversion overflowed,
+ return 0 on success. */
+PyAPI_FUNC(int) _PyTime_AsTimevalTime_t(
+ _PyTime_t t,
+ time_t *secs,
+ int *us,
+ _PyTime_round_t round);
+
#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)
/* Convert a timestamp to a timespec structure (nanosecond resolution).
tv_nsec is always positive.
Modified: trunk/lib/win64_vc12/python/include/python3.5/unicodeobject.h
===================================================================
--- trunk/lib/win64_vc12/python/include/python3.5/unicodeobject.h 2016-02-15 08:13:59 UTC (rev 61632)
+++ trunk/lib/win64_vc12/python/include/python3.5/unicodeobject.h 2016-02-17 16:26:39 UTC (rev 61633)
@@ -965,7 +965,7 @@
Py_ssize_t end
);
-/* Append a ASCII-encoded byte string.
+/* Append an ASCII-encoded byte string.
Return 0 on success, raise an exception and return -1 on error. */
PyAPI_FUNC(int)
_PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer,
@@ -2041,7 +2041,7 @@
int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
);
-/* Apply a argument tuple or dictionary to a format string and return
+/* Apply an argument tuple or dictionary to a format string and return
the resulting Unicode string. */
PyAPI_FUNC(PyObject *) PyUnicode_Format(
Modified: trunk/lib/win64_vc12/python/lib/python35.dll
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list