[Python-checkins] r85004 - in python/branches/release27-maint: Misc/NEWS Python/ceval.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Sep 25 05:17:56 2010
New Revision: 85004

Log:
Merged revisions 85003 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85003 | benjamin.peterson | 2010-09-24 22:14:33 -0500 (Fri, 24 Sep 2010) | 1 line
  
  don't count keyword arguments as positional #9943
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Python/ceval.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Sep 25 05:17:56 2010
@@ -15,6 +15,9 @@
 - Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
   thread-local storage key.
 
+- Issue #9943: Improve the TypeError raised for passing too many positional
+  arguments.
+
 - Issue #4947: The write() method of sys.stdout and sys.stderr uses their
   encoding and errors attributes instead of using utf-8 in strict mode, to get
   the same behaviour than the print statement.

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