mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2013-01-02 09:37:33 -06:00
commit 140794d6e7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Doc/library/pickle.rst
View file

@ -352,8 +352,9 @@ The following types can be pickled:
* classes that are defined at the top level of a module * classes that are defined at the top level of a module
* instances of such classes whose :attr:`__dict__` or :meth:`__setstate__` is * instances of such classes whose :attr:`__dict__` or the result of calling
picklable (see section :ref:`pickle-protocol` for details) :meth:`__getstate__` is picklable (see section :ref:`pickle-protocol` for
details).
Attempts to pickle unpicklable objects will raise the :exc:`PicklingError` Attempts to pickle unpicklable objects will raise the :exc:`PicklingError`
exception; when this happens, an unspecified number of bytes may have already exception; when this happens, an unspecified number of bytes may have already
@ -364,8 +365,8 @@ raised in this case. You can carefully raise this limit with
Note that functions (built-in and user-defined) are pickled by "fully qualified" 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 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 pickled, along with the name of the module the function is defined in. Neither
function's code, nor any of its function attributes are pickled. Thus the 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 defining module must be importable in the unpickling environment, and the module
must contain the named object, otherwise an exception will be raised. [#]_ must contain the named object, otherwise an exception will be raised. [#]_

4
Misc/NEWS
View file

@ -184,8 +184,8 @@ Library
- Issue 10527: make multiprocessing use poll() instead of select() if available. - Issue 10527: make multiprocessing use poll() instead of select() if available.
- Issue #16485: Fix file descriptor not being closed if file header patching - Issue #16485: Now file descriptors are closed if file header patching failed
fails on closing of aifc file. on closing an aifc file.
- Issue #12065: connect_ex() on an SSL socket now returns the original errno - Issue #12065: connect_ex() on an SSL socket now returns the original errno
when the socket's timeout expires (it used to return None). when the socket's timeout expires (it used to return None).