builtin: Update builtin_all and builtin_any for Python3

corona10 · sbinet · commit b55db0be2d49 · 2018-08-31T15:17:52.000+02:00
Update builtin_all and builtin_any for Python3 reference: - https://docs.python.org/3/library/functions.html#all - https://docs.python.org/3/library/functions.html#all Fixes: #14
diff --git a/builtin/builtin.go b/builtin/builtin.go
@@ -237,7 +237,6 @@ If the iterable is empty, return True.
 
 func builtin_all(self, seq py.Object) (py.Object, error) {
 	iter, err := py.Iter(seq)
-	res := false
 	if err != nil {
 		return nil, err
 	}
@@ -249,14 +248,11 @@ func builtin_all(self, seq py.Object) (py.Object, error) {
 			}
 			return nil, err
 		}
-		if py.ObjectIsTrue(item) {
-			res = true
-		} else {
-			res = false
-			break
+		if !py.ObjectIsTrue(item) {
+			return py.False, nil
 		}
 	}
-	return py.NewBool(res), nil
+	return py.True, nil
 }
 
 const any_doc = `any(iterable) -> bool
@@ -266,7 +262,6 @@ If the iterable is empty, Py_RETURN_FALSE."`
 
 func builtin_any(self, seq py.Object) (py.Object, error) {
 	iter, err := py.Iter(seq)
-	res := false
 	if err != nil {
 		return nil, err
 	}
@@ -279,11 +274,10 @@ func builtin_any(self, seq py.Object) (py.Object, error) {
 			return nil, err
 		}
 		if py.ObjectIsTrue(item) {
-			res = true
-			break
+			return py.True, nil
 		}
 	}
-	return py.NewBool(res), nil
+	return py.False, nil
 }
 
 const round_doc = `round(number[, ndigits]) -> number
diff --git a/builtin/tests/builtin.py b/builtin/tests/builtin.py
@@ -11,7 +11,7 @@
 assert all((0,0,0)) == False
 assert all((1,1,0)) == False
 assert all(["hello", "world"]) == True
-assert all([]) == False
+assert all([]) == True
 
 doc="any"
 assert any((0,0,0)) == False

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ If the iterable is empty, return True.`
`237`	`237`
`238`	`238`	`func builtin_all(self, seq py.Object) (py.Object, error) {`
`239`	`239`	`iter, err := py.Iter(seq)`
`240`		`- res := false`
`241`	`240`	`if err != nil {`
`242`	`241`	`return nil, err`
`243`	`242`	`}`
`@@ -249,14 +248,11 @@ func builtin_all(self, seq py.Object) (py.Object, error) {`
`249`	`248`	`}`
`250`	`249`	`return nil, err`
`251`	`250`	`}`
`252`		`- if py.ObjectIsTrue(item) {`
`253`		`- res = true`
`254`		`- } else {`
`255`		`- res = false`
`256`		`- break`
	`251`	`+ if !py.ObjectIsTrue(item) {`
	`252`	`+ return py.False, nil`
`257`	`253`	`}`
`258`	`254`	`}`
`259`		`- return py.NewBool(res), nil`
	`255`	`+ return py.True, nil`
`260`	`256`	`}`
`261`	`257`
`262`	`258`	const any_doc = `any(iterable) -> bool
@@ -266,7 +262,6 @@ If the iterable is empty, Py_RETURN_FALSE."`
`266`	`262`
`267`	`263`	`func builtin_any(self, seq py.Object) (py.Object, error) {`
`268`	`264`	`iter, err := py.Iter(seq)`
`269`		`- res := false`
`270`	`265`	`if err != nil {`
`271`	`266`	`return nil, err`
`272`	`267`	`}`
`@@ -279,11 +274,10 @@ func builtin_any(self, seq py.Object) (py.Object, error) {`
`279`	`274`	`return nil, err`
`280`	`275`	`}`
`281`	`276`	`if py.ObjectIsTrue(item) {`
`282`		`- res = true`
`283`		`- break`
	`277`	`+ return py.True, nil`
`284`	`278`	`}`
`285`	`279`	`}`
`286`		`- return py.NewBool(res), nil`
	`280`	`+ return py.False, nil`
`287`	`281`	`}`
`288`	`282`
`289`	`283`	const round_doc = `round(number[, ndigits]) -> number