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.

diff --git a/Doc/lib/libnew.tex b/Doc/lib/libnew.tex
index 9547b588a635e458b21d1076a47f6efa3952858a..67bfb2ed797200a203c26627976e91dc704d09ab 100644 (file)
--- 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}}}