Merge branch '0.24.x'

f6264818 · Stefan Behnel · 8cbe1ab9 · 7441a409 · f6264818
Commit f6264818 authored Mar 28, 2016 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Cython/Utility/ModuleSetupCode.c Cython/Utility/ModuleSetupCode.c +4 -0

No files found.
--- a/Cython/Utility/ModuleSetupCode.c
+++ b/Cython/Utility/ModuleSetupCode.c
@@ -119,6 +119,10 @@
  #define PyUnicode_Contains(u, s)  PySequence_Contains(u, s)
 #endif

+#if CYTHON_COMPILING_IN_PYPY && !defined(PyObject_Format)
+  #define PyObject_Format(obj, fmt)  PyObject_CallMethod(obj, "__format__", "O", fmt)
+#endif
+
 #if CYTHON_COMPILING_IN_PYPY && !defined(PyObject_Malloc)
  #define PyObject_Malloc(s)   PyMem_Malloc(s)
  #define PyObject_Free(p)     PyMem_Free(p)