Merged revisions 72009 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72009 | georg.brandl | 2009-04-27 17:29:09 +0200 (Mo, 27 Apr 2009) | 3 lines
Demote warnings to notices where appropriate, following the goal that as few "red box" warnings
should clutter the docs as possible. Part 1: stuff that gets merged to Py3k.
........
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
index bb0da80..1c70196 100644
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -66,8 +66,8 @@
.. warning::
The :mod:`pickle` module is not intended to be secure against erroneous or
- maliciously constructed data. Never unpickle data received from an untrusted or
- unauthenticated source.
+ maliciously constructed data. Never unpickle data received from an untrusted
+ or unauthenticated source.
Note that serialization is a more primitive notion than persistence; although
:mod:`pickle` reads and writes file objects, it does not handle the issue of
@@ -437,6 +437,7 @@
the methods :meth:`__getstate__` and :meth:`__setstate__`.
.. note::
+
At unpickling time, some methods like :meth:`__getattr__`,
:meth:`__getattribute__`, or :meth:`__setattr__` may be called upon the
instance. In case those methods rely on some internal invariant being