summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2002-01-28 15:05:14 (GMT)
committerMichael W. Hudson <mwh@python.net>2002-01-28 15:05:14 (GMT)
commit409ab5f32544219865180540a7f41c83a16380e9 (patch)
treeaa0d9c76c1701d2a9ae9cedaa966c055ab92513e
parentdd562b49fc954a01c7d47f6baf1454d0044244d0 (diff)
downloadcpython-409ab5f32544219865180540a7f41c83a16380e9.zip
cpython-409ab5f32544219865180540a7f41c83a16380e9.tar.gz
cpython-409ab5f32544219865180540a7f41c83a16380e9.tar.bz2
It's merge time!
Backport gvanrossum's checkin of revision 1.9: There's no need for typechecks on the second and third argument of new.instancemethod() -- the instancemethod object is now a perfectly general container. This fixes SF bug ##503091 (Pedro Rodriquez): new.instancemethod fails for new classes This is a 2.2.1 candidate.
-rw-r--r--Doc/lib/libnew.tex3
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/lib/libnew.tex b/Doc/lib/libnew.tex
index 9547b58..67bfb2e 100644
--- a/Doc/lib/libnew.tex
+++ b/Doc/lib/libnew.tex
@@ -25,8 +25,7 @@ the object will be in a consistent state.
\begin{funcdesc}{instancemethod}{function, instance, class}
This function will return a method object, bound to \var{instance}, or
unbound if \var{instance} is \code{None}. \var{function} must be
-callable, and \var{instance} must be an instance object or
-\code{None}.
+callable.
\end{funcdesc}
\begin{funcdesc}{function}{code, globals\optional{, name\optional{, argdefs}}}