Commit febf956a authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.23.x'

Conflicts:
	CHANGES.rst
parents 6b96e7db f4ae2572
...@@ -34,6 +34,16 @@ Other changes ...@@ -34,6 +34,16 @@ Other changes
------------- -------------
0.23.2 (2015-0x-yy)
===================
Bugs fixed
----------
* Invalid C code when caching known builtin methods.
This fixes ticket 860.
0.23.1 (2015-08-22) 0.23.1 (2015-08-22)
=================== ===================
......
...@@ -1106,8 +1106,10 @@ static CYTHON_INLINE int __Pyx_PyObject_SetAttrStr(PyObject* obj, PyObject* attr ...@@ -1106,8 +1106,10 @@ static CYTHON_INLINE int __Pyx_PyObject_SetAttrStr(PyObject* obj, PyObject* attr
typedef struct { typedef struct {
PyObject *type; PyObject *type;
PyObject **method_name; PyObject **method_name;
PyCFunction func; // set on first access (direct C function pointer) // "func" is set on first access (direct C function pointer)
PyObject *method; // set on first access (fallback) PyCFunction func;
// "method" is set on first access (fallback)
PyObject *method;
int flag; int flag;
} __Pyx_CachedCFunction; } __Pyx_CachedCFunction;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment