Big diff: Use new "|" union syntax (#5872)

stubs/docutils/docutils/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, NamedTuple, Optional, Tuple
+from typing import Any, ClassVar, NamedTuple, Tuple
 
 __docformat__: str
 __version__: str
@@ -24,11 +24,11 @@ class DataError(ApplicationError): ...
 
 class SettingsSpec:
     settings_spec: ClassVar[Tuple[Any, ...]]
-    settings_defaults: ClassVar[Optional[dict[Any, Any]]]
-    settings_default_overrides: ClassVar[Optional[dict[Any, Any]]]
+    settings_defaults: ClassVar[dict[Any, Any] | None]
+    settings_default_overrides: ClassVar[dict[Any, Any] | None]
     relative_path_settings: ClassVar[Tuple[Any, ...]]
-    config_section: ClassVar[Optional[str]]
-    config_section_dependencies: ClassVar[Optional[Tuple[str, ...]]]
+    config_section: ClassVar[str | None]
+    config_section_dependencies: ClassVar[Tuple[str, ...] | None]
 
 class TransformSpec:
     def get_transforms(self) -> list[Any]: ...
@@ -36,6 +36,6 @@ class TransformSpec:
     unknown_reference_resolvers: ClassVar[list[Any]]
 
 class Component(SettingsSpec, TransformSpec):
-    component_type: ClassVar[Optional[str]]
+    component_type: ClassVar[str | None]
     supported: ClassVar[Tuple[str, ...]]
     def supports(self, format: str) -> bool: ...

stubs/docutils/docutils/frontend.pyi

@@ -1,6 +1,6 @@
 import optparse
 from configparser import RawConfigParser
-from typing import Any, ClassVar, Optional, Tuple
+from typing import Any, ClassVar, Tuple
 
 from docutils import SettingsSpec
 from docutils.utils import DependencyList
@@ -9,41 +9,39 @@ __docformat__: str
 
 def store_multiple(option, opt, value, parser, *args, **kwargs) -> None: ...
 def read_config_file(option, opt, value, parser) -> None: ...
-def validate_encoding(setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...): ...
+def validate_encoding(setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...): ...
 def validate_encoding_error_handler(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ): ...
 def validate_encoding_and_error_handler(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ): ...
 def validate_boolean(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> bool: ...
 def validate_nonnegative_int(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> int: ...
 def validate_threshold(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> int: ...
 def validate_colon_separated_string_list(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> list[str]: ...
 def validate_comma_separated_list(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> list[str]: ...
 def validate_url_trailing_slash(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> str: ...
 def validate_dependency_file(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> DependencyList: ...
-def validate_strip_class(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
-): ...
+def validate_strip_class(setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...): ...
 def validate_smartquotes_locales(
-    setting, value, option_parser, config_parser: Optional[Any] = ..., config_section: Optional[Any] = ...
+    setting, value, option_parser, config_parser: Any | None = ..., config_section: Any | None = ...
 ) -> list[tuple[str, str]]: ...
-def make_paths_absolute(pathdict, keys, base_path: Optional[Any] = ...) -> None: ...
+def make_paths_absolute(pathdict, keys, base_path: Any | None = ...) -> None: ...
 def make_one_path_absolute(base_path, path) -> str: ...
 def filter_settings_spec(settings_spec, *exclude, **replace) -> Tuple[Any, ...]: ...
 

stubs/docutils/docutils/io.pyi

@@ -1,5 +1,5 @@
 from _typeshed import OpenBinaryModeReading, OpenBinaryModeWriting, OpenTextModeReading, OpenTextModeWriting
-from typing import Any, ClassVar, Optional, Union
+from typing import Any, ClassVar
 
 from docutils import TransformSpec
 
@@ -8,22 +8,22 @@ __docformat__: str
 class InputError(IOError): ...
 class OutputError(IOError): ...
 
-def check_encoding(stream: Any, encoding: str) -> Optional[bool]: ...
+def check_encoding(stream: Any, encoding: str) -> bool | None: ...
 
 class Input(TransformSpec):
     component_type: ClassVar[str]
-    default_source_path: ClassVar[Optional[str]]
+    default_source_path: ClassVar[str | None]
     def read(self) -> Any: ...
     def __getattr__(self, name: str) -> Any: ...  # incomplete
 
 class Output(TransformSpec):
     component_type: ClassVar[str]
-    default_destination_path: ClassVar[Optional[str]]
+    default_destination_path: ClassVar[str | None]
     def __init__(
         self,
-        destination: Optional[Any] = ...,
-        destination_path: Optional[Any] = ...,
-        encoding: Optional[str] = ...,
+        destination: Any | None = ...,
+        destination_path: Any | None = ...,
+        encoding: str | None = ...,
         error_handler: str = ...,
     ) -> None: ...
     def write(self, data: str) -> Any: ...  # returns bytes or str
@@ -32,18 +32,18 @@ class Output(TransformSpec):
 class FileInput(Input):
     def __init__(
         self,
-        source: Optional[Any] = ...,
-        source_path: Optional[Any] = ...,
-        encoding: Optional[str] = ...,
+        source: Any | None = ...,
+        source_path: Any | None = ...,
+        encoding: str | None = ...,
         error_handler: str = ...,
         autoclose: bool = ...,
-        mode: Union[OpenTextModeReading, OpenBinaryModeReading] = ...,
+        mode: OpenTextModeReading | OpenBinaryModeReading = ...,
     ) -> None: ...
     def readlines(self) -> list[str]: ...
     def close(self) -> None: ...
 
 class FileOutput(Output):
-    mode: ClassVar[Union[OpenTextModeWriting, OpenBinaryModeWriting]]
+    mode: ClassVar[OpenTextModeWriting | OpenBinaryModeWriting]
     def __getattr__(self, name: str) -> Any: ...  # incomplete
 
 class BinaryFileOutput(FileOutput): ...
@@ -53,7 +53,7 @@ class StringInput(Input):
 
 class StringOutput(Output):
     default_destination_path: ClassVar[str]
-    destination: Union[str, bytes]  # only defined after call to write()
+    destination: str | bytes  # only defined after call to write()
 
 class NullInput(Input):
     default_source_path: ClassVar[str]

stubs/docutils/docutils/parsers/rst/__init__.pyi

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Optional, Tuple
+from typing import Any, ClassVar, Tuple
 from typing_extensions import Literal
 
 from docutils import parsers
@@ -8,7 +8,7 @@ class Parser(parsers.Parser):
     initial_state: Literal["Body", "RFC2822Body"]
     state_classes: Any
     inliner: Any
-    def __init__(self, rfc2822: bool = ..., inliner: Optional[Any] = ...) -> None: ...
+    def __init__(self, rfc2822: bool = ..., inliner: Any | None = ...) -> None: ...
 
 class DirectiveError(Exception):
     level: Any

stubs/docutils/docutils/utils/__init__.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, Optional
+from typing import Any
 
 from docutils.io import FileOutput
 
@@ -7,9 +7,9 @@ _list = list
 
 class DependencyList:
     list: _list[str]
-    file: Optional[FileOutput]
-    def __init__(self, output_file: Optional[str] = ..., dependencies: Iterable[str] = ...) -> None: ...
-    def set_output(self, output_file: Optional[str]) -> None: ...
+    file: FileOutput | None
+    def __init__(self, output_file: str | None = ..., dependencies: Iterable[str] = ...) -> None: ...
+    def set_output(self, output_file: str | None) -> None: ...
     def add(self, *filenames: str) -> None: ...
     def close(self) -> None: ...