[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/31015ca8091a
changeset:   96855:31015ca8091a
parent:      96851:bb9fc884a838
parent:      96854:4e81960d89aa
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jul 06 09:41:20 2015 -0500
summary:
  merge 3.5

files:
  Doc/library/pickle.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -26,9 +26,9 @@
 
 .. 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

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