Finish backporting new buffer API to Python 2.6. Left to do: memoryview object and structmodule. But, these need to be finished in Python 3.0 first. No objects support the new buffer API in Python 2.6 as of yet, and except for the memoryview object, I don't think they will.
diff --git a/Include/Python.h b/Include/Python.h
index 56d20ab..763b144 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -90,6 +90,7 @@
#endif
#include "rangeobject.h"
#include "stringobject.h"
+/* #include "memoryobject.h" */
#include "bufferobject.h"
#include "tupleobject.h"
#include "listobject.h"
diff --git a/Include/abstract.h b/Include/abstract.h
index 159e67d..3e5cf12 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -532,9 +532,10 @@
/* new buffer API */
#define PyObject_CheckBuffer(obj) \
- (((obj)->ob_type->tp_as_buffer != NULL) && \
- ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
-
+ (((obj)->ob_type->tp_as_buffer != NULL) && \
+ (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_NEWBUFFER)) && \
+ ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
+
/* Return 1 if the getbuffer function is available, otherwise
return 0 */