Merge remote-tracking branch 'upstream/master'

raff · raff · commit 312e57ee1666 · 2018-12-13T13:11:42.000-08:00
diff --git a/README.md b/README.md
@@ -77,8 +77,14 @@ Lots!
 
   * [grumpy](https://github.com/grumpyhome/grumpy) - a python to go transpiler
 
+## Community
+
+You can chat with the go-python community (or which gpython is part)
+at [go-python@googlegroups.com](https://groups.google.com/forum/#!forum/go-python)
+or on the [Gophers Slack](https://gophers.slack.com/) in the `#go-python` channel.
+
 ## License
 
 This is licensed under the MIT licence, however it contains code which
 was ported fairly directly directly from the cpython source code under
-the (PSF LICENSE)[https://github.com/python/cpython/blob/master/LICENSE].
+the [PSF LICENSE](https://github.com/python/cpython/blob/master/LICENSE).
diff --git a/parser/make_grammar_test.py b/parser/make_grammar_test.py
@@ -10,6 +10,7 @@
 
 import sys
 import ast
+import datetime
 import subprocess
 
 inp = [
@@ -57,6 +58,7 @@
     ("[1,]", "eval"),
     ("[1,2]", "eval"),
     ("[1,2,]", "eval"),
+    ("[e for e in (1,2,3)]", "eval"),
 
     # tuple
     ("( a for a in ab )", "eval"),
@@ -375,6 +377,9 @@
     ("a, b = *a", "exec"),
     ("a = yield a", "exec"),
     ('''a.b = 1''', "exec"),
+    ("[e for e in [1, 2, 3]] = 3", "exec", SyntaxError),
+    ("{e for e in [1, 2, 3]} = 3", "exec", SyntaxError),
+    ("{e: e**2 for e in [1, 2, 3]} = 3", "exec", SyntaxError),
     ('''f() = 1''', "exec", SyntaxError),
     ('''lambda: x = 1''', "exec", SyntaxError),
     ('''(a + b) = 1''', "exec", SyntaxError),
@@ -493,21 +498,26 @@ def escape(x):
 def main():
     """Write grammar_data_test.go"""
     path = "grammar_data_test.go"
-    out = ["""// Test data generated by make_grammar_test.py - do not edit
+    year = datetime.datetime.now().year
+    out = ["""// Copyright {year} The go-python Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Test data generated by make_grammar_test.py - do not edit
 
 package parser
 
 import (
 "github.com/go-python/gpython/py"
 )
 
-var grammarTestData = []struct {
+var grammarTestData = []struct {{
 in   string
 mode string
 out  string
 exceptionType *py.Type
 errString string
-}{"""]
+}}{{""".format(year=year)]
     for x in inp:
         source, mode = x[:2]
         if len(x) > 2:
diff --git a/py/exception.go b/py/exception.go
@@ -158,11 +158,7 @@ func (exc *ExceptionInfo) TracebackDump(w io.Writer) {
 	}
 	fmt.Fprintf(w, "Traceback (most recent call last):\n")
 	exc.Traceback.TracebackDump(w)
-	name := "<nil>"
-	if exc.Type != nil {
-		name = exc.Type.Name
-	}
-	fmt.Fprintf(w, "%v: %v\n", name, exc.Value)
+	fmt.Fprintf(w, "%v\n", exc.Value)
 }
 
 // Test for being set
diff --git a/py/sequence.go b/py/sequence.go
@@ -93,10 +93,13 @@ func Iterate(obj Object, fn func(Object) bool) error {
 			return err
 		}
 		for {
-			item, finished := Next(iterator)
-			if finished != nil {
+			item, err := Next(iterator)
+			if err == StopIteration {
 				break
 			}
+			if err != nil {
+				return err
+			}
 			if fn(item) {
 				break
 			}
diff --git a/repl/web/wasm_exec.js b/repl/web/wasm_exec.js
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Slightly modified by ncw to:
+//  * add empty implementation of fsyncSync
+// See wasm_exec.js.patch for details
+
 (() => {
 	// Map web browser API and Node.js API to a single common API (preferring web standards over Node.js API).
 	const isNodeJS = typeof process !== "undefined";
@@ -59,6 +63,8 @@
 				err.code = "ENOSYS";
 				callback(err);
 			},
+			fsyncSync(fd) {
+			},
 		};
 	}
 
diff --git a/vm/tests/generators.py b/vm/tests/generators.py
@@ -25,6 +25,14 @@ def g2():
         yield i
 assert tuple(g2()) == (0,1,2,3,4)
 
+doc="generator 3"
+ok = False
+try:
+    list(ax for x in range(10))
+except NameError:
+    ok = True
+assert ok, "NameError not raised"
+
 doc="yield from"
 def g3():
     yield "potato"

Original file line number	Diff line number	Diff line change
`@@ -158,11 +158,7 @@ func (exc *ExceptionInfo) TracebackDump(w io.Writer) {`
`158`	`158`	`}`
`159`	`159`	`fmt.Fprintf(w, "Traceback (most recent call last):\n")`
`160`	`160`	`exc.Traceback.TracebackDump(w)`
`161`		`- name := "<nil>"`
`162`		`- if exc.Type != nil {`
`163`		`- name = exc.Type.Name`
`164`		`- }`
`165`		`- fmt.Fprintf(w, "%v: %v\n", name, exc.Value)`
	`161`	`+ fmt.Fprintf(w, "%v\n", exc.Value)`
`166`	`162`	`}`
`167`	`163`
`168`	`164`	`// Test for being set`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,13 @@ func Iterate(obj Object, fn func(Object) bool) error {`
`93`	`93`	`return err`
`94`	`94`	`}`
`95`	`95`	`for {`
`96`		`- item, finished := Next(iterator)`
`97`		`- if finished != nil {`
	`96`	`+ item, err := Next(iterator)`
	`97`	`+ if err == StopIteration {`
`98`	`98`	`break`
`99`	`99`	`}`
	`100`	`+ if err != nil {`
	`101`	`+ return err`
	`102`	`+ }`
`100`	`103`	`if fn(item) {`
`101`	`104`	`break`
`102`	`105`	`}`