Fix panic in len() when grumpy.Len() raises. (#161)

0d83793a · Dylan Trotter · GitHub · d8ef329c · 0d83793a
Commit 0d83793a authored Jan 18, 2017 by Dylan Trotter Committed by GitHub Jan 18, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

runtime/builtin_types.go runtime/builtin_types.go +4 -1

No files found.
--- a/runtime/builtin_types.go
+++ b/runtime/builtin_types.go
@@ -448,7 +448,10 @@ func builtinLen(f *Frame, args Args, kwargs KWArgs) (*Object, *BaseException) {
 		return nil, raised
 	}
 	ret, raised := Len(f, args[0])
-	return ret.ToObject(), raised
+	if raised != nil {
+		return nil, raised
+	}
+	return ret.ToObject(), nil
 }
 func builtinMax(f *Frame, args Args, kwargs KWArgs) (*Object, *BaseException) {