[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61744] trunk/lib/darwin-9.x.universal: fix python to not cache in blender*.app folders anymore
Martijn Berger
martijn.berger at gmail.com
Mon Oct 24 17:04:53 CEST 2016
Revision: 61744
https://developer.blender.org/rBL61744
Author: juicyfruit
Date: 2016-10-24 17:04:50 +0200 (Mon, 24 Oct 2016)
Log Message:
-----------
fix python to not cache in blender*.app folders anymore
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/python/bin/python3.5m
trunk/lib/darwin-9.x.universal/python/include/python3.5m/Python-ast.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/abstract.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/bytesobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/ceval.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/code.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/codecs.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/dictobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/frameobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/genobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/listobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/object.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/patchlevel.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pyatomic.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pyconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pymacconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pystate.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pythonrun.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/pytime.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/traceback.h
trunk/lib/darwin-9.x.universal/python/include/python3.5m/unicodeobject.h
trunk/lib/darwin-9.x.universal/python/lib/python3.5/libpython3.5m.a
trunk/lib/darwin-9.x.universal/release/python_x86_64.zip
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/python/python_do_not_cache_in_blender_bundle.patch
Modified: trunk/lib/darwin-9.x.universal/python/bin/python3.5m
===================================================================
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.5m/Python-ast.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/Python-ast.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/Python-ast.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -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/darwin-9.x.universal/python/include/python3.5m/abstract.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/abstract.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/abstract.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -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
@@ -192,8 +192,8 @@
int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v);
Set the value of the attribute named attr_name, for object o,
- to the value, v. Returns -1 on failure. This is
- the equivalent of the Python statement: o.attr_name=v.
+ to the value v. Raise an exception and return -1 on failure; return 0 on
+ success. This is the equivalent of the Python statement o.attr_name=v.
*/
@@ -202,8 +202,8 @@
int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
Set the value of the attribute named attr_name, for object o,
- to the value, v. Returns -1 on failure. This is
- the equivalent of the Python statement: o.attr_name=v.
+ to the value v. Raise an exception and return -1 on failure; return 0 on
+ success. This is the equivalent of the Python statement o.attr_name=v.
*/
@@ -435,9 +435,9 @@
PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
/*
- Map the object, key, to the value, v. Returns
- -1 on failure. This is the equivalent of the Python
- statement: o[key]=v.
+ Map the object key to the value v. Raise an exception and return -1
+ on failure; return 0 on success. This is the equivalent of the Python
+ statement o[key]=v.
*/
PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
@@ -993,9 +993,9 @@
PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
/*
- Assign object v to the ith element of o. Returns
- -1 on failure. This is the equivalent of the Python
- statement: o[i]=v.
+ Assign object v to the ith element of o. Raise an exception and return
+ -1 on failure; return 0 on success. This is the equivalent of the
+ Python statement o[i]=v.
*/
PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
@@ -1216,23 +1216,23 @@
PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
/*
- On success, return a list or tuple of the keys in object o.
- On failure, return NULL.
+ On success, return a list, a tuple or a dictionary view in case of a dict,
+ of the keys in object o. On failure, return NULL.
*/
PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
/*
- On success, return a list or tuple of the values in object o.
- On failure, return NULL.
+ On success, return a list, a tuple or a dictionary view in case of a dict,
+ of the values in object o. On failure, return NULL.
*/
PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
/*
- On success, return a list or tuple of the items in object o,
- where each item is a tuple containing a key-value pair.
- On failure, return NULL.
+ On success, return a list, a tuple or a dictionary view in case of a dict,
+ of the items in object o, where each item is a tuple containing a key-value
+ pair. On failure, return NULL.
*/
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.5m/bytesobject.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/bytesobject.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/bytesobject.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -82,7 +82,7 @@
#endif
/* Provides access to the internal data buffer and size of a string
- object or the default encoded version of an Unicode object. Passing
+ object or the default encoded version of a Unicode object. Passing
NULL as *len parameter will force the string buffer to be
0-terminated (passing a string with embedded NULL characters will
cause an exception). */
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.5m/ceval.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/ceval.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/ceval.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -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/darwin-9.x.universal/python/include/python3.5m/code.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/code.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/code.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -108,12 +108,21 @@
int ap_upper;
} PyAddrPair;
+#ifndef Py_LIMITED_API
/* Update *bounds to describe the first and one-past-the-last instructions in the
same line as lasti. Return the number of that line.
*/
-#ifndef Py_LIMITED_API
PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
int lasti, PyAddrPair *bounds);
+
+/* Create a comparable key used to compare constants taking in account the
+ * object type. It is used to make sure types are not coerced (e.g., float and
+ * complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms
+ *
+ * Return (type(obj), obj, ...): a tuple with variable size (at least 2 items)
+ * depending on the type and the value. The type is the first item to not
+ * compare bytes and str which can raise a BytesWarning exception. */
+PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
#endif
PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.5m/codecs.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/codecs.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/codecs.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -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/darwin-9.x.universal/python/include/python3.5m/dictobject.h
===================================================================
--- trunk/lib/darwin-9.x.universal/python/include/python3.5m/dictobject.h 2016-10-19 14:55:58 UTC (rev 61743)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.5m/dictobject.h 2016-10-24 15:04:50 UTC (rev 61744)
@@ -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);
@@ -94,7 +98,7 @@
PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
-PyObject *_PyDict_SizeOf(PyDictObject *);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list