RustPython · youknowone · Apr 23, 2024 · Apr 23, 2024
diff --git a/Lib/__future__.py b/Lib/__future__.py
@@ -33,7 +33,7 @@
 to use the feature in question, but may continue to use such imports.
 
 MandatoryRelease may also be None, meaning that a planned feature got
-dropped.
+dropped or that the release version is undetermined.
 
 Instances of class _Feature have two corresponding methods,
 .getOptionalRelease() and .getMandatoryRelease().
@@ -96,7 +96,7 @@ def getMandatoryRelease(self):
         """Return release in which this feature will become mandatory.
 
         This is a 5-tuple, of the same form as sys.version_info, or, if
-        the feature was dropped, is None.
+        the feature was dropped, or the release date is undetermined, is None.
         """
         return self.mandatory
 
@@ -143,5 +143,5 @@ def __repr__(self):
                           CO_FUTURE_GENERATOR_STOP)
 
 annotations = _Feature((3, 7, 0, "beta", 1),
-                       (3, 11, 0, "alpha", 0),
+                       None,
                        CO_FUTURE_ANNOTATIONS)
diff --git a/Lib/test/test_future_stmt/__init__.py b/Lib/test/test_future_stmt/__init__.py
@@ -0,0 +1,6 @@
+import os
+from test import support
+
+
+def load_tests(*args):
+    return support.load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/badsyntax_future10.py → ...st/test_future_stmt/badsyntax_future10.py b/Lib/test/badsyntax_future10.py → ...st/test_future_stmt/badsyntax_future10.py
diff --git a/Lib/test/badsyntax_future3.py → ...est/test_future_stmt/badsyntax_future3.py b/Lib/test/badsyntax_future3.py → ...est/test_future_stmt/badsyntax_future3.py
diff --git a/Lib/test/badsyntax_future4.py → ...est/test_future_stmt/badsyntax_future4.py b/Lib/test/badsyntax_future4.py → ...est/test_future_stmt/badsyntax_future4.py
diff --git a/Lib/test/badsyntax_future5.py → ...est/test_future_stmt/badsyntax_future5.py b/Lib/test/badsyntax_future5.py → ...est/test_future_stmt/badsyntax_future5.py
diff --git a/Lib/test/badsyntax_future6.py → ...est/test_future_stmt/badsyntax_future6.py b/Lib/test/badsyntax_future6.py → ...est/test_future_stmt/badsyntax_future6.py
diff --git a/Lib/test/badsyntax_future7.py → ...est/test_future_stmt/badsyntax_future7.py b/Lib/test/badsyntax_future7.py → ...est/test_future_stmt/badsyntax_future7.py
diff --git a/Lib/test/badsyntax_future8.py → ...est/test_future_stmt/badsyntax_future8.py b/Lib/test/badsyntax_future8.py → ...est/test_future_stmt/badsyntax_future8.py
diff --git a/Lib/test/badsyntax_future9.py → ...est/test_future_stmt/badsyntax_future9.py b/Lib/test/badsyntax_future9.py → ...est/test_future_stmt/badsyntax_future9.py
diff --git a/Lib/test/future_test1.py → Lib/test/test_future_stmt/future_test1.py b/Lib/test/future_test1.py → Lib/test/test_future_stmt/future_test1.py
diff --git a/Lib/test/future_test2.py → Lib/test/test_future_stmt/future_test2.py b/Lib/test/future_test2.py → Lib/test/test_future_stmt/future_test2.py
diff --git a/Lib/test/test_future.py → Lib/test/test_future_stmt/test_future.py b/Lib/test/test_future.py → Lib/test/test_future_stmt/test_future.py
@@ -3,8 +3,8 @@
 import __future__
 import ast
 import unittest
-from test import support
 from test.support import import_helper
+from test.support.script_helper import spawn_python, kill_python
 from textwrap import dedent
 import os
 import re
@@ -25,73 +25,87 @@ def check_syntax_error(self, err, basename, lineno, offset=1):
         self.assertEqual(err.offset, offset)
 
     def test_future1(self):
-        with import_helper.CleanImport('future_test1'):
-            from test import future_test1
+        with import_helper.CleanImport('test.test_future_stmt.future_test1'):
+            from test.test_future_stmt import future_test1
             self.assertEqual(future_test1.result, 6)
 
     def test_future2(self):
-        with import_helper.CleanImport('future_test2'):
-            from test import future_test2
+        with import_helper.CleanImport('test.test_future_stmt.future_test2'):
+            from test.test_future_stmt import future_test2
             self.assertEqual(future_test2.result, 6)
 
-    def test_future3(self):
-        with import_helper.CleanImport('test_future3'):
-            from test import test_future3
+    def test_future_single_import(self):
+        with import_helper.CleanImport(
+            'test.test_future_stmt.test_future_single_import',
+        ):
+            from test.test_future_stmt import test_future_single_import
+
+    def test_future_multiple_imports(self):
+        with import_helper.CleanImport(
+            'test.test_future_stmt.test_future_multiple_imports',
+        ):
+            from test.test_future_stmt import test_future_multiple_imports
+
+    def test_future_multiple_features(self):
+        with import_helper.CleanImport(
+            "test.test_future_stmt.test_future_multiple_features",
+        ):
+            from test.test_future_stmt import test_future_multiple_features
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture3(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future3
+            from test.test_future_stmt import badsyntax_future3
         self.check_syntax_error(cm.exception, "badsyntax_future3", 3)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture4(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future4
+            from test.test_future_stmt import badsyntax_future4
         self.check_syntax_error(cm.exception, "badsyntax_future4", 3)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture5(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future5
+            from test.test_future_stmt import badsyntax_future5
         self.check_syntax_error(cm.exception, "badsyntax_future5", 4)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture6(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future6
+            from test.test_future_stmt import badsyntax_future6
         self.check_syntax_error(cm.exception, "badsyntax_future6", 3)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture7(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future7
-        self.check_syntax_error(cm.exception, "badsyntax_future7", 3, 53)
+            from test.test_future_stmt import badsyntax_future7
+        self.check_syntax_error(cm.exception, "badsyntax_future7", 3, 54)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture8(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future8
+            from test.test_future_stmt import badsyntax_future8
         self.check_syntax_error(cm.exception, "badsyntax_future8", 3)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture9(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future9
+            from test.test_future_stmt import badsyntax_future9
         self.check_syntax_error(cm.exception, "badsyntax_future9", 3)
 
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_badfuture10(self):
         with self.assertRaises(SyntaxError) as cm:
-            from test import badsyntax_future10
+            from test.test_future_stmt import badsyntax_future10
         self.check_syntax_error(cm.exception, "badsyntax_future10", 3)
 
     def test_ensure_flags_dont_clash(self):
@@ -129,15 +143,20 @@ def test_parserhack(self):
         else:
             self.fail("syntax error didn't occur")
 
-    def test_multiple_features(self):
-        with import_helper.CleanImport("test.test_future5"):
-            from test import test_future5
-
     def test_unicode_literals_exec(self):
         scope = {}
         exec("from __future__ import unicode_literals; x = ''", {}, scope)
         self.assertIsInstance(scope["x"], str)
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
+    def test_syntactical_future_repl(self):
+        p = spawn_python('-i')
+        p.stdin.write(b"from __future__ import barry_as_FLUFL\n")
+        p.stdin.write(b"2 <> 3\n")
+        out = kill_python(p)
+        self.assertNotIn(b'SyntaxError: invalid syntax', out)
+
 class AnnotationsFutureTestCase(unittest.TestCase):
     template = dedent(
         """

diff --git a/Lib/test/test___future__.py → ...est/test_future_stmt/test_future_flags.py b/Lib/test/test___future__.py → ...est/test_future_stmt/test_future_flags.py
diff --git a/Lib/test/test_future5.py → ...ure_stmt/test_future_multiple_features.py b/Lib/test/test_future5.py → ...ure_stmt/test_future_multiple_features.py
diff --git a/Lib/test/test_future4.py → ...ture_stmt/test_future_multiple_imports.py b/Lib/test/test_future4.py → ...ture_stmt/test_future_multiple_imports.py
diff --git a/Lib/test/test_future3.py → ..._future_stmt/test_future_single_import.py b/Lib/test/test_future3.py → ..._future_stmt/test_future_single_import.py