[Python-checkins] r85005 - in python/branches/py3k: Misc/NEWS Python/ceval.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Sep 25 05:25:42 2010
New Revision: 85005

Log:
revert r85003, poorly considered; breaks tests

Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Python/ceval.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Sep 25 05:25:42 2010
@@ -10,9 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #9943: Improve the TypeError raised for passing too many positional
-  arguments.
-
 - Issue #9930: Remove bogus subtype check that was causing (e.g.)
   float.__rdiv__(2.0, 3) to return NotImplemented instead of the
   expected 1.5.

Modified: python/branches/py3k/Python/ceval.c
==============================================================================
--- python/branches/py3k/Python/ceval.c	(original)
+++ python/branches/py3k/Python/ceval.c	Sat Sep 25 05:25:42 2010
@@ -3104,7 +3104,7 @@
                     defcount ? "at most" : "exactly",
                     co->co_argcount,
                     co->co_argcount == 1 ? "" : "s",
-                    argcount);
+                    argcount + kwcount);
                 goto fail;
             }
             n = co->co_argcount;