Fix ParseTupleAndKeywords

ncw · ncw · commit 9a1bb3ee5108 · 2013-12-12T22:32:15.000Z
diff --git a/notes.txt b/notes.txt
@@ -33,7 +33,6 @@ astyle --style=java --add-brackets < x.c > x.go
 
 Roadmap
 =======
-  * FIXME (int("a", base=16): gives int() got multiple values for argument 'base'
   * make pystone.py work
   * make enough of internals work so can run python tests
   * import python tests and write go test runner to run them
diff --git a/py/args.go b/py/args.go
@@ -431,7 +431,7 @@ func ParseTupleAndKeywords(args Tuple, kwargs StringDict, format string, kwlist
 	args = args.Copy()
 	for i, kw := range kwlist {
 		if value, ok := kwargs[kw]; ok {
-			if len(args) >= i {
+			if len(args) > i {
 				panic(ExceptionNewf(TypeError, "%s() got multiple values for argument '%s'", name, kw))
 			}
 			args = append(args, value)

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ func ParseTupleAndKeywords(args Tuple, kwargs StringDict, format string, kwlist`
`431`	`431`	`args = args.Copy()`
`432`	`432`	`for i, kw := range kwlist {`
`433`	`433`	`if value, ok := kwargs[kw]; ok {`
`434`		`- if len(args) >= i {`
	`434`	`+ if len(args) > i {`
`435`	`435`	`panic(ExceptionNewf(TypeError, "%s() got multiple values for argument '%s'", name, kw))`
`436`	`436`	`}`
`437`	`437`	`args = append(args, value)`