diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-10 04:24:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-10 04:24:47 (GMT) |
| commit | 82f69fd93bda1d176b8d8b3e080a576bd2f97c98 (patch) | |
| tree | aee74717b4bbfcc6d387d952c21d07ec73640bea /Lib | |
| parent | 63c46b25d047cd1b1ac725a2b7a284fd235e56c3 (diff) | |
| parent | 0654be18b387cbd136bfb62d77849111a954b58b (diff) | |
| download | cpython-82f69fd93bda1d176b8d8b3e080a576bd2f97c98.zip cpython-82f69fd93bda1d176b8d8b3e080a576bd2f97c98.tar.gz cpython-82f69fd93bda1d176b8d8b3e080a576bd2f97c98.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/lib2to3/Grammar.txt | 3 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_parser.py | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt index bc084e9..e667bcd 100644 --- a/Lib/lib2to3/Grammar.txt +++ b/Lib/lib2to3/Grammar.txt @@ -155,4 +155,5 @@ testlist1: test (',' test)* # not used in grammar, but may appear in "node" passed from Parser to Compiler encoding_decl: NAME -yield_expr: 'yield' [testlist] +yield_expr: 'yield' [yield_arg] +yield_arg: 'from' test | testlist diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py index 83682b7..b64469c 100644 --- a/Lib/lib2to3/tests/test_parser.py +++ b/Lib/lib2to3/tests/test_parser.py @@ -54,6 +54,13 @@ class TestMatrixMultiplication(GrammarTest): self.validate("a @= b") +class TestYieldFrom(GrammarTest): + def test_matrix_multiplication_operator(self): + self.validate("yield from x") + self.validate("(yield from x) + y") + self.invalid_syntax("yield from") + + class TestRaiseChanges(GrammarTest): def test_2x_style_1(self): self.validate("raise") |