RFC: from __future__ import annotations + pyupgrade

.gitignore

@@ -57,3 +57,4 @@ pip-wheel-metadata/
 
 # pytest debug logs generated via --debug
 pytestdebug.log
+/.dmypy.json

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
     rev: v3.12.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py38-plus]
+        args: ['--application-directories=.:src', --py38-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.15.0
     hooks:

bench/bench.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 if __name__ == "__main__":

bench/bench_argcomplete.py

@@ -2,6 +2,8 @@
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116
 # FastFilesCompleter    0.7383    1.0760
+from __future__ import annotations
+
 import timeit
 
 imports = [

bench/empty.py

@@ -1,2 +1,4 @@
+from __future__ import annotations
+
 for i in range(1000):
     exec("def test_func_%d(): pass" % i)

bench/manyparam.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

bench/skip.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 SKIP = True

bench/unit_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from unittest import TestCase  # noqa: F401
 
 for i in range(15000):

bench/xunit.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 for i in range(5000):
     exec(
         f"""

doc/en/conf.py

@@ -15,6 +15,8 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
+from __future__ import annotations
+
 import os
 import shutil
 import sys
@@ -438,7 +440,7 @@
 }
 
 
-def configure_logging(app: "sphinx.application.Sphinx") -> None:
+def configure_logging(app: sphinx.application.Sphinx) -> None:
     """Configure Sphinx's WarningHandler to handle (expected) missing include."""
     import sphinx.util.logging
     import logging
@@ -461,7 +463,7 @@ def filter(self, record: logging.LogRecord) -> bool:
     warn_handler[0].filters.insert(0, WarnLogFilter())
 
 
-def setup(app: "sphinx.application.Sphinx") -> None:
+def setup(app: sphinx.application.Sphinx) -> None:
     app.add_crossref_type(
         "fixture",
         "fixture",

doc/en/conftest.py

@@ -1 +1,3 @@
+from __future__ import annotations
+
 collect_ignore = ["conf.py"]

doc/en/example/assertion/failure_demo.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from pytest import raises
 

doc/en/example/assertion/global_testmodule_config/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 import pytest

doc/en/example/assertion/global_testmodule_config/test_hello_world.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 hello = "world"
 
 

doc/en/example/assertion/test_failures.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import shutil
 

doc/en/example/assertion/test_setup_flow_example.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 def setup_module(module):
     module.TestStateFullThing.classcount = 0
 

doc/en/example/conftest.py

@@ -1 +1,3 @@
+from __future__ import annotations
+
 collect_ignore = ["nonpython", "customdirectory"]

doc/en/example/customdirectory/conftest.py

@@ -1,4 +1,6 @@
 # content of conftest.py
+from __future__ import annotations
+
 import json
 
 import pytest

doc/en/example/customdirectory/tests/test_first.py

@@ -1,3 +1,6 @@
 # content of test_first.py
+from __future__ import annotations
+
+
 def test_1():
     pass

doc/en/example/customdirectory/tests/test_second.py

@@ -1,3 +1,6 @@
 # content of test_second.py
+from __future__ import annotations
+
+
 def test_2():
     pass

doc/en/example/customdirectory/tests/test_third.py

@@ -1,3 +1,6 @@
 # content of test_third.py
+from __future__ import annotations
+
+
 def test_3():
     pass

doc/en/example/fixtures/test_fixtures_order_autouse.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_autouse_multiple_scopes.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_autouse_temp_effects.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_dependencies.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_order_scope.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/fixtures/test_fixtures_request_different_scope.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/multipython.py

@@ -1,5 +1,7 @@
 """Module containing a parametrized tests testing cross-python serialization
 via the pickle module."""
+from __future__ import annotations
+
 import shutil
 import subprocess
 import textwrap

doc/en/example/nonpython/conftest.py

@@ -1,4 +1,6 @@
 # content of conftest.py
+from __future__ import annotations
+
 import pytest
 
 

doc/en/example/pythoncollection.py

@@ -1,5 +1,6 @@
 # run this with $ pytest --collect-only test_collectonly.py
 #
+from __future__ import annotations
 
 
 def test_function():

doc/en/example/xfail_demo.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 xfail = pytest.mark.xfail

extra/get_issues.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from pathlib import Path
 

scripts/generate-gh-release-notes.py

@@ -8,6 +8,8 @@
 
 Requires Python3.6+.
 """
+from __future__ import annotations
+
 import re
 import sys
 from pathlib import Path

scripts/prepare-release-pr.py

@@ -13,6 +13,8 @@
 **Token**: currently the token from the GitHub Actions is used, pushed with
 `pytest bot <pytestbot@gmail.com>` commit author.
 """
+from __future__ import annotations
+
 import argparse
 import re
 from pathlib import Path

scripts/release.py

@@ -1,5 +1,7 @@
 # mypy: disallow-untyped-defs
 """Invoke development tasks."""
+from __future__ import annotations
+
 import argparse
 import os
 from pathlib import Path

scripts/towncrier-draft-to-file.py

@@ -1,7 +1,10 @@
-# mypy: disallow-untyped-defs
+from __future__ import annotations
+
 import sys
 from subprocess import call
 
+# mypy: disallow-untyped-defs
+
 
 def main() -> int:
     """

scripts/update-plugin-list.py

@@ -1,4 +1,6 @@
 # mypy: disallow-untyped-defs
+from __future__ import annotations
+
 import datetime
 import pathlib
 import re

src/_pytest/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 __all__ = ["__version__", "version_tuple"]
 
 try:

src/_pytest/_argcomplete.py

@@ -61,13 +61,13 @@
   which should throw a KeyError: 'COMPLINE' (which is properly set by the
   global argcomplete script).
 """
+from __future__ import annotations
+
 import argparse
 import os
 import sys
 from glob import glob
 from typing import Any
-from typing import List
-from typing import Optional
 
 
 class FastFilesCompleter:
@@ -76,7 +76,7 @@ class FastFilesCompleter:
     def __init__(self, directories: bool = True) -> None:
         self.directories = directories
 
-    def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
+    def __call__(self, prefix: str, **kwargs: Any) -> list[str]:
         # Only called on non option completions.
         if os.sep in prefix[1:]:
             prefix_dir = len(os.path.dirname(prefix) + os.sep)
@@ -103,7 +103,7 @@ def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
         import argcomplete.completers
     except ImportError:
         sys.exit(-1)
-    filescompleter: Optional[FastFilesCompleter] = FastFilesCompleter()
+    filescompleter: FastFilesCompleter | None = FastFilesCompleter()
 
     def try_argcomplete(parser: argparse.ArgumentParser) -> None:
         argcomplete.autocomplete(parser, always_complete_options=False)

src/_pytest/_code/__init__.py

@@ -1,4 +1,6 @@
 """Python inspection/code generation API."""
+from __future__ import annotations
+
 from .code import Code
 from .code import ExceptionInfo
 from .code import filter_traceback