summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2004-12-07 07:05:57 (GMT)
committerRaymond Hettinger <python@rcn.com>2004-12-07 07:05:57 (GMT)
commita6b45cc31d33c166c84866f78d504a99d409895c (patch)
treedaffa37b19305cdf19902242a177ed436e396fb1 /Doc
parent84667c063a1e93a985134f7cef376edf82941c02 (diff)
downloadcpython-a6b45cc31d33c166c84866f78d504a99d409895c.zip
cpython-a6b45cc31d33c166c84866f78d504a99d409895c.tar.gz
cpython-a6b45cc31d33c166c84866f78d504a99d409895c.tar.bz2
Eliminate the deprecated option to return None instead of a tuple of arguments in __reduce__().
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libpickle.tex8
1 files changed, 2 insertions, 6 deletions
diff --git a/Doc/lib/libpickle.tex b/Doc/lib/libpickle.tex
index 067f468..4013432 100644
--- a/Doc/lib/libpickle.tex
+++ b/Doc/lib/libpickle.tex
@@ -515,12 +515,8 @@ Otherwise, an \exception{UnpicklingError} will be raised in the
unpickling environment. Note that as usual, the callable itself is
pickled by name.
-\item A tuple of arguments for the callable object, or \code{None}.
-\deprecated{2.3}{If this item is \code{None}, then instead of calling
-the callable directly, its \method{__basicnew__()} method is called
-without arguments; this method should also return the unpickled
-object. Providing \code{None} is deprecated, however; return a
-tuple of arguments instead.}
+\item A tuple of arguments for the callable object.
+\versionchanged[Formerly, this argument could also be \code{None}]{2.5}
\item Optionally, the object's state, which will be passed to
the object's \method{__setstate__()} method as described in