diff Include/object.h @ 64299:4c978cd3640f 3.1

Merged revisions 84344 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84344 | antoine.pitrou | 2010-08-28 20:17:03 +0200 (sam., 28 août 2010) | 4 lines Issue #1868: Eliminate subtle timing issues in thread-local objects by getting rid of the cached copy of thread-local attribute dictionary. ........
author Antoine Pitrou <solipsis@pitrou.net>
date Sat, 28 Aug 2010 18:27:09 +0000
parents f197407bdba2
children f4b7ecf8a5f8 e8969fb822fc
line wrap: on
line diff
--- a/Include/object.h	Thu Aug 26 06:24:04 2010 +0000
+++ b/Include/object.h	Sat Aug 28 18:27:09 2010 +0000
@@ -448,6 +448,14 @@
 
 PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
 
+/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
+   dict as the last parameter. */
+PyAPI_FUNC(PyObject *)
+_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *);
+PyAPI_FUNC(int)
+_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
+                                 PyObject *, PyObject *);
+
 
 /* PyObject_Dir(obj) acts like Python builtins.dir(obj), returning a
    list of strings.  PyObject_Dir(NULL) is like builtins.dir(),