summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2013-10-11 11:09:39 +0200
committerStefan Behnel <stefan_ml@behnel.de>2013-10-11 11:09:39 +0200
commit6ac14e0bb3c10b47b7e5f4f8d78dbd7596b59003 (patch)
tree57dee161c286627da20acf12e4eab322cf3c1d88
parentb1196d37948dc1ac17ddd7913057ccc7440c9ad0 (diff)
downloadcython-6ac14e0bb3c10b47b7e5f4f8d78dbd7596b59003.tar.gz
move misplaced PyObject_Format() C-API declaration to right .pxd file
--HG-- extra : transplant_source : Zp%DC%BB8%03%B2%D6%A3%09q%13%25%17%AD6%17%25%1FU
-rw-r--r--Cython/Includes/cpython/buffer.pxd1
-rw-r--r--Cython/Includes/cpython/object.pxd5
2 files changed, 6 insertions, 0 deletions
diff --git a/Cython/Includes/cpython/buffer.pxd b/Cython/Includes/cpython/buffer.pxd
index 01023e650..f5b63cb27 100644
--- a/Cython/Includes/cpython/buffer.pxd
+++ b/Cython/Includes/cpython/buffer.pxd
@@ -103,6 +103,7 @@ cdef extern from "Python.h":
# bytes” of the given length. Return 0 on success and -1 (with
# raising an error) on error.
+ # DEPRECATED HERE: do not cimport from here, cimport from cpython.object instead
object PyObject_Format(object obj, object format_spec)
# Takes an arbitrary object and returns the result of calling
# obj.__format__(format_spec).
diff --git a/Cython/Includes/cpython/object.pxd b/Cython/Includes/cpython/object.pxd
index 077b2add2..dc166a577 100644
--- a/Cython/Includes/cpython/object.pxd
+++ b/Cython/Includes/cpython/object.pxd
@@ -285,3 +285,8 @@ cdef extern from "Python.h":
# and returns NULL if the object cannot be iterated.
Py_ssize_t Py_SIZE(object o)
+
+ object PyObject_Format(object obj, object format_spec)
+ # Takes an arbitrary object and returns the result of calling
+ # obj.__format__(format_spec).
+ # Added in Py2.6