summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-28 18:29:13 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-28 18:29:13 (GMT)
commita408350a08d4aadaec7573648ab91651c32a90df (patch)
tree717563d43e1d65ed46661ba04508513146946e52 /Include
parent7e8fd5ed22f19ede1290fdc692c607556d4e16da (diff)
downloadcpython-a408350a08d4aadaec7573648ab91651c32a90df.zip
cpython-a408350a08d4aadaec7573648ab91651c32a90df.tar.gz
cpython-a408350a08d4aadaec7573648ab91651c32a90df.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.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h
index dffe0f8..b368946 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -492,6 +492,13 @@ PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
/* A slot function whose address we need to compare */
extern int _PyObject_SlotCompare(PyObject *, 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 __builtin__.dir(obj), returning a