Fixes #836 and corrects exception message

vinzenz · vinzenz · commit 8805f14fb3a6 · 2015-08-14T13:03:37.000+02:00
diff --git a/src/runtime/objmodel.cpp b/src/runtime/objmodel.cpp
@@ -3293,8 +3293,8 @@ void rearrangeArguments(ParamReceiveSpec paramspec, const ParamNames* param_name
         getArg(kwargs_idx, oarg1, oarg2, oarg3, oargs) = okwargs;
     }
 
-    if ((!param_names || !param_names->takes_param_names) && argspec.num_keywords && !paramspec.takes_kwargs) {
-        raiseExcHelper(TypeError, "%s() doesn't take keyword arguments", func_name);
+    if ((!param_names || !param_names->takes_param_names) && (argspec.num_keywords || argspec.has_kwargs) && !paramspec.takes_kwargs) {
+        raiseExcHelper(TypeError, "%s() takes no keyword arguments", func_name);
     }
 
     if (argspec.num_keywords)

Original file line number	Diff line number	Diff line change
`@@ -3293,8 +3293,8 @@ void rearrangeArguments(ParamReceiveSpec paramspec, const ParamNames* param_name`
`3293`	`3293`	`getArg(kwargs_idx, oarg1, oarg2, oarg3, oargs) = okwargs;`
`3294`	`3294`	`}`
`3295`	`3295`
`3296`		`- if ((!param_names \|\| !param_names->takes_param_names) && argspec.num_keywords && !paramspec.takes_kwargs) {`
`3297`		`- raiseExcHelper(TypeError, "%s() doesn't take keyword arguments", func_name);`
	`3296`	`+ if ((!param_names \|\| !param_names->takes_param_names) && (argspec.num_keywords \|\| argspec.has_kwargs) && !paramspec.takes_kwargs) {`
	`3297`	`+ raiseExcHelper(TypeError, "%s() takes no keyword arguments", func_name);`
`3298`	`3298`	`}`
`3299`	`3299`
`3300`	`3300`	`if (argspec.num_keywords)`