summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-17 10:24:54 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-17 10:24:54 (GMT)
commit0036bcf8d8c7baf3c27c50d9e03e450ff93585db (patch)
tree5058ffa9c06214a8cb07732b7213b61430a10f65 /Doc
parent047e486c4529b61bfecfeb0bd221cc24a49d0a6e (diff)
downloadcpython-0036bcf8d8c7baf3c27c50d9e03e450ff93585db.zip
cpython-0036bcf8d8c7baf3c27c50d9e03e450ff93585db.tar.gz
cpython-0036bcf8d8c7baf3c27c50d9e03e450ff93585db.tar.bz2
#9105: move pickle warning to a bit more prominent location.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/pickle.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
index 66d1472..24006e2 100644
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -23,6 +23,12 @@ into an object hierarchy. Pickling (and unpickling) is alternatively known as
"serialization", "marshalling," [#]_ or "flattening", however, to avoid
confusion, the terms used here are "pickling" and "unpickling"..
+.. 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.
+
Relationship to other Python modules
------------------------------------
@@ -63,12 +69,6 @@ The :mod:`pickle` module differs from :mod:`marshal` several significant ways:
The :mod:`pickle` serialization format is guaranteed to be backwards compatible
across Python releases.
-.. 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.
-
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
naming persistent objects, nor the (even more complicated) issue of concurrent