From: Michael W. Hudson <mwh@python.net>
Date: Mon, 28 Jan 2002 15:05:14 +0000 (+0000)
Subject: It's merge time!
X-Git-Tag: v2.2.1c1~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=409ab5f32544219865180540a7f41c83a16380e9;p=thirdparty%2FPython%2Fcpython.git

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 9547b588a635..67bfb2ed7972 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}}}