summaryrefslogtreecommitdiffstats
path: root/Doc/library/pickle.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-04-27 16:20:50 (GMT)
committerGeorg Brandl <georg@python.org>2009-04-27 16:20:50 (GMT)
commite720c0aa74ca8e6cf350b808c6ca795e587ebf88 (patch)
treed98ed50657772424243a590928333f96a61bb525 /Doc/library/pickle.rst
parentc67d362a89fe6076120f6de706725c313f515122 (diff)
downloadcpython-e720c0aa74ca8e6cf350b808c6ca795e587ebf88.zip
cpython-e720c0aa74ca8e6cf350b808c6ca795e587ebf88.tar.gz
cpython-e720c0aa74ca8e6cf350b808c6ca795e587ebf88.tar.bz2
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. ........
Diffstat (limited to 'Doc/library/pickle.rst')
-rw-r--r--Doc/library/pickle.rst5
1 files changed, 3 insertions, 2 deletions
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 @@ The :mod:`pickle` module differs from :mod:`marshal` several significant ways:
.. 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 @@ Refer to the section :ref:`pickle-state` for more information about how to use
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