summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-28 18:27:09 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-28 18:27:09 (GMT)
commitfcd2a7960c610c149eec66c16e999032457f47eb (patch)
treea25d0ee3bb1ea18a14bd0a86bad54057841f76c1 /Include
parent06509381a88aa3abb71f70674108fdeb42238606 (diff)
downloadcpython-fcd2a7960c610c149eec66c16e999032457f47eb.zip
cpython-fcd2a7960c610c149eec66c16e999032457f47eb.tar.gz
cpython-fcd2a7960c610c149eec66c16e999032457f47eb.tar.bz2
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. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h
index 6e744bc..ef73a21 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -448,6 +448,14 @@ PyAPI_FUNC(int) PyCallable_Check(PyObject *);
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(),