[pypy-commit] pypy py3.5: Update test_future.py to test 3.5 features and fix expected results

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r87896:63ecc1fc81d4
Date: 2016-10-20 16:16 +0100
http://bitbucket.org/pypy/pypy/changeset/63ecc1fc81d4/

Log:	Update test_future.py to test 3.5 features and fix expected results

diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
--- a/pypy/interpreter/pyparser/test/test_future.py
+++ b/pypy/interpreter/pyparser/test/test_future.py
@@ -8,14 +8,14 @@
     expected_last_future = expected_last_future or tokens[-1][2:4]
     #
     flags, last_future_import = future.add_future_flags(
-        future.futureFlags_2_7, tokens)
+        future.futureFlags_3_5, tokens)
     assert last_future_import == expected_last_future
     return flags
 
 def test_docstring():
     s = '"Docstring\\" "\nfrom  __future__ import division\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_comment():
     s = '# A comment about nothing ;\n'
@@ -46,97 +46,82 @@
 def test_from():
     s = 'from  __future__ import division\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_froms():
     s = 'from  __future__ import division, generators, with_statement\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_from_as():
     s = 'from  __future__ import division as b\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
-    
+    assert f == 0
+
 def test_froms_as():
     s = 'from  __future__ import division as b, generators as c\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED)
+    assert f == 0
 
 def test_from_paren():
     s = 'from  __future__ import (division)\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_froms_paren():
     s = 'from  __future__ import (division, generators)\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED)
+    assert f == 0
 
 def test_froms_paren_as():
     s = 'from  __future__ import (division as b, generators,)\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED)
+    assert f == 0
 
 def test_paren_with_newline():
     s = 'from __future__ import (division,\nabsolute_import)\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_ABSOLUTE_IMPORT)
+    assert f == 0
 
 def test_paren_with_newline_2():
     s = 'from __future__ import (\ndivision,\nabsolute_import)\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_ABSOLUTE_IMPORT)
+    assert f == 0
 
 def test_multiline():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,)\nfrom __future__ import with_statement\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_windows_style_lineendings():
     s = '"abc" #def\r\n  #ghi\r\nfrom  __future__ import (division as b, generators,)\r\nfrom __future__ import with_statement\r\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_mac_style_lineendings():
     s = '"abc" #def\r  #ghi\rfrom  __future__ import (division as b, generators,)\rfrom __future__ import with_statement\r'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_semicolon():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_semicolon_2():
     s = 'from  __future__ import division; from foo import bar'
     f = run(s, expected_last_future=(1, 39))
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_full_chain():
     s = '"abc" #def\n  #ghi\nfrom  __future__ import (division as b, generators,);  from __future__ import with_statement\n'
     f = run(s)
-    assert f == (fut.CO_FUTURE_DIVISION |
-                 fut.CO_GENERATOR_ALLOWED |
-                 fut.CO_FUTURE_WITH_STATEMENT)
+    assert f == 0
 
 def test_intervening_code():
     s = 'from  __future__ import (division as b, generators,)\nfrom sys import modules\nfrom __future__ import with_statement\n'
     f = run(s, expected_last_future=(2, 5))
-    assert f == (fut.CO_FUTURE_DIVISION | fut.CO_GENERATOR_ALLOWED)
+    assert f == 0
 
 def test_nonexisting():
     s = 'from  __future__ import non_existing_feature\n'
@@ -146,42 +131,42 @@
 def test_nonexisting_2():
     s = 'from  __future__ import non_existing_feature, with_statement\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_from_import_abs_import():
     s = 'from  __future__ import absolute_import\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_ABSOLUTE_IMPORT
+    assert f == 0
 
 def test_raw_doc():
     s = 'r"Doc"\nfrom __future__ import with_statement\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_unicode_doc():
     s = 'u"Doc"\nfrom __future__ import with_statement\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_raw_unicode_doc():
     s = 'ru"Doc"\nfrom __future__ import with_statement\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_continuation_line():
     s = "\\\nfrom __future__ import with_statement\n"
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_continuation_lines():
     s = "\\\n  \t\\\nfrom __future__ import with_statement\n"
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_lots_of_continuation_lines():
     s = "\\\n\\\n\\\n\\\n\\\n\\\n\nfrom __future__ import with_statement\n"
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0
 
 def test_continuation_lines_raise():
     s = "   \\\n  \t\\\nfrom __future__ import with_statement\n"
@@ -191,21 +176,21 @@
 def test_continuation_lines_in_docstring_single_quoted():
     s = '"\\\n\\\n\\\n\\\n\\\n\\\n"\nfrom  __future__ import division\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_continuation_lines_in_docstring_triple_quoted():
     s = '"""\\\n\\\n\\\n\\\n\\\n\\\n"""\nfrom  __future__ import division\n'
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_blank_lines():
     s = ('\n\t\n\nfrom __future__ import with_statement'
          '  \n  \n  \nfrom __future__ import division')
     f = run(s)
-    assert f == fut.CO_FUTURE_WITH_STATEMENT | fut.CO_FUTURE_DIVISION
+    assert f == 0
 
 def test_dummy_semicolons():
     s = ('from __future__ import division;\n'
          'from __future__ import with_statement;')
     f = run(s)
-    assert f == fut.CO_FUTURE_DIVISION | fut.CO_FUTURE_WITH_STATEMENT
+    assert f == 0