bpo-38605: Revert making 'from __future__ import annotations' the default (GH-25490)
This reverts commits 044a1048ca93d466965afc027b91a5a9eb9ce23c and 1be456ae9d53bb1cba2b24fc86175c282d1c2169, adapting the code to changes that happened after it.
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 19e5c0f..8e36ae2 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -237,26 +237,28 @@ def bug42562():
2 0 SETUP_ANNOTATIONS
2 LOAD_CONST 0 (1)
4 STORE_NAME 0 (x)
- 6 LOAD_CONST 1 ('int')
- 8 LOAD_NAME 1 (__annotations__)
- 10 LOAD_CONST 2 ('x')
+ 6 LOAD_NAME 1 (int)
+ 8 LOAD_NAME 2 (__annotations__)
+ 10 LOAD_CONST 1 ('x')
12 STORE_SUBSCR
- 3 14 LOAD_CONST 3 ('fun(1)')
- 16 LOAD_NAME 1 (__annotations__)
- 18 LOAD_CONST 4 ('y')
- 20 STORE_SUBSCR
+ 3 14 LOAD_NAME 3 (fun)
+ 16 LOAD_CONST 0 (1)
+ 18 CALL_FUNCTION 1
+ 20 LOAD_NAME 2 (__annotations__)
+ 22 LOAD_CONST 2 ('y')
+ 24 STORE_SUBSCR
- 4 22 LOAD_CONST 0 (1)
- 24 LOAD_NAME 2 (lst)
- 26 LOAD_NAME 3 (fun)
- 28 LOAD_CONST 5 (0)
- 30 CALL_FUNCTION 1
- 32 STORE_SUBSCR
- 34 LOAD_NAME 4 (int)
- 36 POP_TOP
- 38 LOAD_CONST 6 (None)
- 40 RETURN_VALUE
+ 4 26 LOAD_CONST 0 (1)
+ 28 LOAD_NAME 4 (lst)
+ 30 LOAD_NAME 3 (fun)
+ 32 LOAD_CONST 3 (0)
+ 34 CALL_FUNCTION 1
+ 36 STORE_SUBSCR
+ 38 LOAD_NAME 1 (int)
+ 40 POP_TOP
+ 42 LOAD_CONST 4 (None)
+ 44 RETURN_VALUE
"""
compound_stmt_str = """\