merge 3.2

This commit is contained in:
Benjamin Peterson 2012-02-21 11:12:14 -05:00
commit d9a3591ed1
4 changed files with 14 additions and 4 deletions

View file

@ -560,6 +560,10 @@ typedef struct {
} _Py_HashSecret_t;
PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
#ifdef Py_DEBUG
PyAPI_DATA(int) _Py_HashSecret_Initialized;
#endif
/* Helper for passing objects to printf and the like */
#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj))