Fix for SF bug #117241

When a method is called with no regular arguments and * args, defer
the first arg is subclass check until after the * args have been
expanded.

N.B. The CALL_FUNCTION implementation is getting really hairy; should
review it to see if it can be simplified.

1 files changed, 18 insertions, 0 deletions

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 10e4d6c..7dddabc 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -144,3 +144,21 @@ for i in range(512):
     d[key] = i
 a, b = f2(1, *(2, 3), **d)
 print len(a), len(b), b == d
+
+class Foo:
+    def method(self, arg1, arg2):
+        return arg1 + arg2
+
+x = Foo()
+print Foo.method(*(x, 1, 2))
+print Foo.method(x, *(1, 2))
+try:
+    print Foo.method(*(1, 2, 3))
+except TypeError, err:
+    print err
+try:
+    print Foo.method(1, *(2, 3))
+except TypeError, err:
+    print err
+
+