merge 3.5

This commit is contained in:
Benjamin Peterson 2015-07-06 09:41:20 -05:00
commit df48b8571e

View file

@ -26,9 +26,9 @@ 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.
The :mod:`pickle` module is secure against erroneous or maliciously
constructed data. Never unpickle data received from an untrusted or
unauthenticated source.
Relationship to other Python modules