[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/4264994fd6a3
changeset:   81238:4264994fd6a3
branch:      2.7
parent:      81237:0012d4f0ca59
parent:      81236:08195c46f634
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 02 09:37:33 2013 -0600
summary:
  merge heads

files:
  Doc/library/pickle.rst |  9 +++++----
  Misc/NEWS              |  4 ++--
  2 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -352,8 +352,9 @@
 
 * classes that are defined at the top level of a module
 
-* instances of such classes whose :attr:`__dict__` or :meth:`__setstate__` is
-  picklable  (see section :ref:`pickle-protocol` for details)
+* instances of such classes whose :attr:`__dict__` or the result of calling
+  :meth:`__getstate__` is picklable  (see section :ref:`pickle-protocol` for
+  details).
 
 Attempts to pickle unpicklable objects will raise the :exc:`PicklingError`
 exception; when this happens, an unspecified number of bytes may have already
@@ -364,8 +365,8 @@
 
 Note that functions (built-in and user-defined) are pickled by "fully qualified"
 name reference, not by value.  This means that only the function name is
-pickled, along with the name of the module the function is defined in.  Neither the
-function's code, nor any of its function attributes are pickled.  Thus the
+pickled, along with the name of the module the function is defined in.  Neither
+the function's code, nor any of its function attributes are pickled.  Thus the
 defining module must be importable in the unpickling environment, and the module
 must contain the named object, otherwise an exception will be raised. [#]_
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -184,8 +184,8 @@
 
 - Issue 10527: make multiprocessing use poll() instead of select() if available.
 
-- Issue #16485: Fix file descriptor not being closed if file header patching
-  fails on closing of aifc file.
+- Issue #16485: Now file descriptors are closed if file header patching failed
+  on closing an aifc file.
 
 - Issue #12065: connect_ex() on an SSL socket now returns the original errno
   when the socket's timeout expires (it used to return None).

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