[pypy-svn] r11862 - pypy/dist/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Tue May  3 15:18:22 2005
New Revision: 11862

Modified:
   pypy/dist/pypy/interpreter/argument.py
Log:
More tweaks of the argument parsing error messages.


Modified: pypy/dist/pypy/interpreter/argument.py
==============================================================================
--- pypy/dist/pypy/interpreter/argument.py	(original)
+++ pypy/dist/pypy/interpreter/argument.py	Tue May  3 15:18:22 2005
@@ -278,7 +278,8 @@
         if kwargname is not None or (kwds_w and self.defaults_w):
             msg2 = "non-keyword "
             if self.missing_args:
-                nargs = len(argnames) - self.missing_args
+                required_args = len(argnames) - len(self.defaults_w)
+                nargs = required_args - self.missing_args
             else:
                 nargs = len(args_w)
         else: