[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#12719)

[benjamin.peterson]

http://hg.python.org/cpython/rev/69df5a8d164e
changeset:   71796:69df5a8d164e
parent:      71795:4090dfdf91a4
parent:      71791:6ef65516fd7a
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Aug 09 16:15:29 2011 -0500
summary:
  merge 3.2 (#12719)

files:
  Doc/c-api/typeobj.rst |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -745,6 +745,11 @@
    This field is not inherited by subtypes (though the attributes defined in here
    are inherited through a different mechanism).
 
+   .. warning::
+
+      It is not safe to use :c:func:`PyDict_SetItem` on or otherwise modify
+      :attr:`tp_dict` with the dictionary C-API.
+
 
 .. c:member:: descrgetfunc PyTypeObject.tp_descr_get
 

-- 
Repository URL: http://hg.python.org/cpython