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

stubs/Jinja2/jinja2/_compat.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing import Any, Optional
+from typing import Any
 
 if sys.version_info >= (3,):
     from urllib.parse import quote_from_bytes
@@ -22,7 +22,7 @@ itervalues: Any
 iteritems: Any
 NativeStringIO: Any
 
-def reraise(tp, value, tb: Optional[Any] = ...): ...
+def reraise(tp, value, tb: Any | None = ...): ...
 
 ifilter: Any
 imap: Any

stubs/Jinja2/jinja2/bccache.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 marshal_dump: Any
 marshal_load: Any
@@ -21,7 +21,7 @@ class BytecodeCache:
     def load_bytecode(self, bucket): ...
     def dump_bytecode(self, bucket): ...
     def clear(self): ...
-    def get_cache_key(self, name, filename: Optional[Any] = ...): ...
+    def get_cache_key(self, name, filename: Any | None = ...): ...
     def get_source_checksum(self, source): ...
     def get_bucket(self, environment, name, filename, source): ...
     def set_bucket(self, bucket): ...
@@ -29,7 +29,7 @@ class BytecodeCache:
 class FileSystemBytecodeCache(BytecodeCache):
     directory: Any
     pattern: Any
-    def __init__(self, directory: Optional[Any] = ..., pattern: str = ...) -> None: ...
+    def __init__(self, directory: Any | None = ..., pattern: str = ...) -> None: ...
     def load_bytecode(self, bucket): ...
     def dump_bytecode(self, bucket): ...
     def clear(self): ...
@@ -39,6 +39,6 @@ class MemcachedBytecodeCache(BytecodeCache):
     prefix: Any
     timeout: Any
     ignore_memcache_errors: Any
-    def __init__(self, client, prefix: str = ..., timeout: Optional[Any] = ..., ignore_memcache_errors: bool = ...) -> None: ...
+    def __init__(self, client, prefix: str = ..., timeout: Any | None = ..., ignore_memcache_errors: bool = ...) -> None: ...
     def load_bytecode(self, bucket): ...
     def dump_bytecode(self, bucket): ...

stubs/Jinja2/jinja2/compiler.pyi

@@ -1,5 +1,5 @@
 from keyword import iskeyword as is_python_keyword
-from typing import Any, Optional
+from typing import Any
 
 from jinja2.visitor import NodeVisitor
 
@@ -8,7 +8,7 @@ dict_item_iter: str
 
 unoptimize_before_dead_code: bool
 
-def generate(node, environment, name, filename, stream: Optional[Any] = ..., defer_init: bool = ...): ...
+def generate(node, environment, name, filename, stream: Any | None = ..., defer_init: bool = ...): ...
 def has_safe_repr(value): ...
 def find_undeclared(nodes, names): ...
 
@@ -33,7 +33,7 @@ class Frame:
     block: Any
     assigned_names: Any
     parent: Any
-    def __init__(self, eval_ctx, parent: Optional[Any] = ...) -> None: ...
+    def __init__(self, eval_ctx, parent: Any | None = ...) -> None: ...
     def copy(self): ...
     def inspect(self, nodes): ...
     def find_shadowed(self, extra: Any = ...): ...
@@ -91,31 +91,31 @@ class CodeGenerator(NodeVisitor):
     tests: Any
     filters: Any
     debug_info: Any
-    def __init__(self, environment, name, filename, stream: Optional[Any] = ..., defer_init: bool = ...) -> None: ...
+    def __init__(self, environment, name, filename, stream: Any | None = ..., defer_init: bool = ...) -> None: ...
     def fail(self, msg, lineno): ...
     def temporary_identifier(self): ...
     def buffer(self, frame): ...
     def return_buffer_contents(self, frame): ...
     def indent(self): ...
     def outdent(self, step: int = ...): ...
-    def start_write(self, frame, node: Optional[Any] = ...): ...
+    def start_write(self, frame, node: Any | None = ...): ...
     def end_write(self, frame): ...
-    def simple_write(self, s, frame, node: Optional[Any] = ...): ...
+    def simple_write(self, s, frame, node: Any | None = ...): ...
     def blockvisit(self, nodes, frame): ...
     def write(self, x): ...
-    def writeline(self, x, node: Optional[Any] = ..., extra: int = ...): ...
-    def newline(self, node: Optional[Any] = ..., extra: int = ...): ...
-    def signature(self, node, frame, extra_kwargs: Optional[Any] = ...): ...
+    def writeline(self, x, node: Any | None = ..., extra: int = ...): ...
+    def newline(self, node: Any | None = ..., extra: int = ...): ...
+    def signature(self, node, frame, extra_kwargs: Any | None = ...): ...
     def pull_locals(self, frame): ...
     def pull_dependencies(self, nodes): ...
     def unoptimize_scope(self, frame): ...
     def push_scope(self, frame, extra_vars: Any = ...): ...
     def pop_scope(self, aliases, frame): ...
-    def function_scoping(self, node, frame, children: Optional[Any] = ..., find_special: bool = ...): ...
-    def macro_body(self, node, frame, children: Optional[Any] = ...): ...
+    def function_scoping(self, node, frame, children: Any | None = ..., find_special: bool = ...): ...
+    def macro_body(self, node, frame, children: Any | None = ...): ...
     def macro_def(self, node, frame): ...
     def position(self, node): ...
-    def visit_Template(self, node, frame: Optional[Any] = ...): ...
+    def visit_Template(self, node, frame: Any | None = ...): ...
     def visit_Block(self, node, frame): ...
     def visit_Extends(self, node, frame): ...
     def visit_Include(self, node, frame): ...

stubs/Jinja2/jinja2/debug.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 tproxy: Any
 raise_helper: str
@@ -20,7 +20,7 @@ class ProcessedTraceback:
     exc_value: Any
     frames: Any
     def __init__(self, exc_type, exc_value, frames) -> None: ...
-    def render_as_text(self, limit: Optional[Any] = ...): ...
+    def render_as_text(self, limit: Any | None = ...): ...
     def render_as_html(self, full: bool = ...): ...
     @property
     def is_template_syntax_error(self): ...
@@ -29,8 +29,8 @@ class ProcessedTraceback:
     @property
     def standard_exc_info(self): ...
 
-def make_traceback(exc_info, source_hint: Optional[Any] = ...): ...
-def translate_syntax_error(error, source: Optional[Any] = ...): ...
+def make_traceback(exc_info, source_hint: Any | None = ...): ...
+def translate_syntax_error(error, source: Any | None = ...): ...
 def translate_exception(exc_info, initial_skip: int = ...): ...
 def fake_exc_info(exc_info, filename, lineno): ...
 

stubs/Jinja2/jinja2/defaults.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from jinja2.filters import FILTERS
 from jinja2.tests import TESTS
@@ -12,8 +12,8 @@ VARIABLE_START_STRING: str
 VARIABLE_END_STRING: str
 COMMENT_START_STRING: str
 COMMENT_END_STRING: str
-LINE_STATEMENT_PREFIX: Optional[str]
-LINE_COMMENT_PREFIX: Optional[str]
+LINE_STATEMENT_PREFIX: str | None
+LINE_COMMENT_PREFIX: str | None
 TRIM_BLOCKS: bool
 LSTRIP_BLOCKS: bool
 NEWLINE_SEQUENCE: str

stubs/Jinja2/jinja2/environment.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Text, Type, Union
+from typing import Any, Callable, Dict, Iterator, List, Sequence, Text, Type
 
 from .bccache import BytecodeCache
 from .loaders import BaseLoader
@@ -63,12 +63,12 @@ class Environment:
         extensions: List[Any] = ...,
         optimized: bool = ...,
         undefined: Type[Undefined] = ...,
-        finalize: Optional[Callable[..., Any]] = ...,
-        autoescape: Union[bool, Callable[[str], bool]] = ...,
-        loader: Optional[BaseLoader] = ...,
+        finalize: Callable[..., Any] | None = ...,
+        autoescape: bool | Callable[[str], bool] = ...,
+        loader: BaseLoader | None = ...,
         cache_size: int = ...,
         auto_reload: bool = ...,
-        bytecode_cache: Optional[BytecodeCache] = ...,
+        bytecode_cache: BytecodeCache | None = ...,
         enable_async: bool = ...,
     ) -> None: ...
     def add_extension(self, extension): ...
@@ -90,75 +90,65 @@ class Environment:
         undefined: Type[Undefined] = ...,
         finalize: Callable[..., Any] = ...,
         autoescape: bool = ...,
-        loader: Optional[BaseLoader] = ...,
+        loader: BaseLoader | None = ...,
         cache_size: int = ...,
         auto_reload: bool = ...,
-        bytecode_cache: Optional[BytecodeCache] = ...,
+        bytecode_cache: BytecodeCache | None = ...,
     ): ...
     lexer: Any
     def iter_extensions(self): ...
     def getitem(self, obj, argument): ...
     def getattr(self, obj, attribute): ...
     def call_filter(
-        self,
-        name,
-        value,
-        args: Optional[Any] = ...,
-        kwargs: Optional[Any] = ...,
-        context: Optional[Any] = ...,
-        eval_ctx: Optional[Any] = ...,
-    ): ...
-    def call_test(self, name, value, args: Optional[Any] = ..., kwargs: Optional[Any] = ...): ...
-    def parse(self, source, name: Optional[Any] = ..., filename: Optional[Any] = ...): ...
-    def lex(self, source, name: Optional[Any] = ..., filename: Optional[Any] = ...): ...
-    def preprocess(self, source: Text, name: Optional[Any] = ..., filename: Optional[Any] = ...): ...
-    def compile(
-        self, source, name: Optional[Any] = ..., filename: Optional[Any] = ..., raw: bool = ..., defer_init: bool = ...
+        self, name, value, args: Any | None = ..., kwargs: Any | None = ..., context: Any | None = ..., eval_ctx: Any | None = ...
     ): ...
+    def call_test(self, name, value, args: Any | None = ..., kwargs: Any | None = ...): ...
+    def parse(self, source, name: Any | None = ..., filename: Any | None = ...): ...
+    def lex(self, source, name: Any | None = ..., filename: Any | None = ...): ...
+    def preprocess(self, source: Text, name: Any | None = ..., filename: Any | None = ...): ...
+    def compile(self, source, name: Any | None = ..., filename: Any | None = ..., raw: bool = ..., defer_init: bool = ...): ...
     def compile_expression(self, source: Text, undefined_to_none: bool = ...): ...
     def compile_templates(
         self,
         target,
-        extensions: Optional[Any] = ...,
-        filter_func: Optional[Any] = ...,
+        extensions: Any | None = ...,
+        filter_func: Any | None = ...,
         zip: str = ...,
-        log_function: Optional[Any] = ...,
+        log_function: Any | None = ...,
         ignore_errors: bool = ...,
         py_compile: bool = ...,
     ): ...
-    def list_templates(self, extensions: Optional[Any] = ..., filter_func: Optional[Any] = ...): ...
-    def handle_exception(self, exc_info: Optional[Any] = ..., rendered: bool = ..., source_hint: Optional[Any] = ...): ...
-    def join_path(self, template: Union[Template, Text], parent: Text) -> Text: ...
-    def get_template(
-        self, name: Union[Template, Text], parent: Optional[Text] = ..., globals: Optional[Any] = ...
-    ) -> Template: ...
+    def list_templates(self, extensions: Any | None = ..., filter_func: Any | None = ...): ...
+    def handle_exception(self, exc_info: Any | None = ..., rendered: bool = ..., source_hint: Any | None = ...): ...
+    def join_path(self, template: Template | Text, parent: Text) -> Text: ...
+    def get_template(self, name: Template | Text, parent: Text | None = ..., globals: Any | None = ...) -> Template: ...
     def select_template(
-        self, names: Sequence[Union[Template, Text]], parent: Optional[Text] = ..., globals: Optional[Dict[str, Any]] = ...
+        self, names: Sequence[Template | Text], parent: Text | None = ..., globals: Dict[str, Any] | None = ...
     ) -> Template: ...
     def get_or_select_template(
         self,
-        template_name_or_list: Union[Union[Template, Text], Sequence[Union[Template, Text]]],
-        parent: Optional[Text] = ...,
-        globals: Optional[Dict[str, Any]] = ...,
+        template_name_or_list: Template | Text | Sequence[Template | Text],
+        parent: Text | None = ...,
+        globals: Dict[str, Any] | None = ...,
     ) -> Template: ...
     def from_string(
-        self, source: Text, globals: Optional[Dict[str, Any]] = ..., template_class: Optional[Type[Template]] = ...
+        self, source: Text, globals: Dict[str, Any] | None = ..., template_class: Type[Template] | None = ...
     ) -> Template: ...
-    def make_globals(self, d: Optional[Dict[str, Any]]) -> Dict[str, Any]: ...
+    def make_globals(self, d: Dict[str, Any] | None) -> Dict[str, Any]: ...
     # Frequently added extensions are included here:
     # from InternationalizationExtension:
-    def install_gettext_translations(self, translations: Any, newstyle: Optional[bool] = ...): ...
-    def install_null_translations(self, newstyle: Optional[bool] = ...): ...
+    def install_gettext_translations(self, translations: Any, newstyle: bool | None = ...): ...
+    def install_null_translations(self, newstyle: bool | None = ...): ...
     def install_gettext_callables(
-        self, gettext: Callable[..., Any], ngettext: Callable[..., Any], newstyle: Optional[bool] = ...
+        self, gettext: Callable[..., Any], ngettext: Callable[..., Any], newstyle: bool | None = ...
     ): ...
     def uninstall_gettext_translations(self, translations: Any): ...
     def extract_translations(self, source: Any, gettext_functions: Any): ...
     newstyle_gettext: bool
 
 class Template:
-    name: Optional[str]
-    filename: Optional[str]
+    name: str | None
+    filename: str | None
     def __new__(
         cls,
         source,
@@ -177,22 +167,22 @@ class Template:
         extensions: Any = ...,
         optimized: bool = ...,
         undefined: Any = ...,
-        finalize: Optional[Any] = ...,
+        finalize: Any | None = ...,
         autoescape: bool = ...,
     ): ...
     environment: Environment = ...
     @classmethod
-    def from_code(cls, environment, code, globals, uptodate: Optional[Any] = ...): ...
+    def from_code(cls, environment, code, globals, uptodate: Any | None = ...): ...
     @classmethod
     def from_module_dict(cls, environment, module_dict, globals): ...
     def render(self, *args, **kwargs) -> Text: ...
     def stream(self, *args, **kwargs) -> TemplateStream: ...
     def generate(self, *args, **kwargs) -> Iterator[Text]: ...
     def new_context(
-        self, vars: Optional[Dict[str, Any]] = ..., shared: bool = ..., locals: Optional[Dict[str, Any]] = ...
+        self, vars: Dict[str, Any] | None = ..., shared: bool = ..., locals: Dict[str, Any] | None = ...
     ) -> Context: ...
     def make_module(
-        self, vars: Optional[Dict[str, Any]] = ..., shared: bool = ..., locals: Optional[Dict[str, Any]] = ...
+        self, vars: Dict[str, Any] | None = ..., shared: bool = ..., locals: Dict[str, Any] | None = ...
     ) -> Context: ...
     @property
     def module(self) -> Any: ...
@@ -216,7 +206,7 @@ class TemplateExpression:
 
 class TemplateStream:
     def __init__(self, gen) -> None: ...
-    def dump(self, fp, encoding: Optional[Text] = ..., errors: Text = ...): ...
+    def dump(self, fp, encoding: Text | None = ..., errors: Text = ...): ...
     buffered: bool
     def disable_buffering(self) -> None: ...
     def enable_buffering(self, size: int = ...) -> None: ...

stubs/Jinja2/jinja2/exceptions.pyi

@@ -1,7 +1,7 @@
-from typing import Any, Optional, Text
+from typing import Any, Text
 
 class TemplateError(Exception):
-    def __init__(self, message: Optional[Text] = ...) -> None: ...
+    def __init__(self, message: Text | None = ...) -> None: ...
     @property
     def message(self): ...
     def __unicode__(self): ...
@@ -10,11 +10,11 @@ class TemplateNotFound(IOError, LookupError, TemplateError):
     message: Any
     name: Any
     templates: Any
-    def __init__(self, name, message: Optional[Text] = ...) -> None: ...
+    def __init__(self, name, message: Text | None = ...) -> None: ...
 
 class TemplatesNotFound(TemplateNotFound):
     templates: Any
-    def __init__(self, names: Any = ..., message: Optional[Text] = ...) -> None: ...
+    def __init__(self, names: Any = ..., message: Text | None = ...) -> None: ...
 
 class TemplateSyntaxError(TemplateError):
     lineno: int
@@ -22,7 +22,7 @@ class TemplateSyntaxError(TemplateError):
     filename: Text
     source: Text
     translated: bool
-    def __init__(self, message: Text, lineno: int, name: Optional[Text] = ..., filename: Optional[Text] = ...) -> None: ...
+    def __init__(self, message: Text, lineno: int, name: Text | None = ..., filename: Text | None = ...) -> None: ...
 
 class TemplateAssertionError(TemplateSyntaxError): ...
 class TemplateRuntimeError(TemplateError): ...

stubs/Jinja2/jinja2/ext.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 GETTEXT_FUNCTIONS: Any
 
@@ -11,18 +11,18 @@ class Extension:
     environment: Any
     def __init__(self, environment) -> None: ...
     def bind(self, environment): ...
-    def preprocess(self, source, name, filename: Optional[Any] = ...): ...
+    def preprocess(self, source, name, filename: Any | None = ...): ...
     def filter_stream(self, stream): ...
     def parse(self, parser): ...
-    def attr(self, name, lineno: Optional[Any] = ...): ...
+    def attr(self, name, lineno: Any | None = ...): ...
     def call_method(
         self,
         name,
-        args: Optional[Any] = ...,
-        kwargs: Optional[Any] = ...,
-        dyn_args: Optional[Any] = ...,
-        dyn_kwargs: Optional[Any] = ...,
-        lineno: Optional[Any] = ...,
+        args: Any | None = ...,
+        kwargs: Any | None = ...,
+        dyn_args: Any | None = ...,
+        dyn_kwargs: Any | None = ...,
+        lineno: Any | None = ...,
     ): ...
 
 class InternationalizationExtension(Extension):

stubs/Jinja2/jinja2/filters.pyi

@@ -1,4 +1,4 @@
-from typing import Any, NamedTuple, Optional
+from typing import Any, NamedTuple
 
 def contextfilter(f): ...
 def evalcontextfilter(f): ...
@@ -6,34 +6,34 @@ def environmentfilter(f): ...
 def make_attrgetter(environment, attribute): ...
 def do_forceescape(value): ...
 def do_urlencode(value): ...
-def do_replace(eval_ctx, s, old, new, count: Optional[Any] = ...): ...
+def do_replace(eval_ctx, s, old, new, count: Any | None = ...): ...
 def do_upper(s): ...
 def do_lower(s): ...
 def do_xmlattr(_eval_ctx, d, autospace: bool = ...): ...
 def do_capitalize(s): ...
 def do_title(s): ...
 def do_dictsort(value, case_sensitive: bool = ..., by: str = ...): ...
-def do_sort(environment, value, reverse: bool = ..., case_sensitive: bool = ..., attribute: Optional[Any] = ...): ...
+def do_sort(environment, value, reverse: bool = ..., case_sensitive: bool = ..., attribute: Any | None = ...): ...
 def do_default(value, default_value: str = ..., boolean: bool = ...): ...
-def do_join(eval_ctx, value, d: str = ..., attribute: Optional[Any] = ...): ...
+def do_join(eval_ctx, value, d: str = ..., attribute: Any | None = ...): ...
 def do_center(value, width: int = ...): ...
 def do_first(environment, seq): ...
 def do_last(environment, seq): ...
 def do_random(environment, seq): ...
 def do_filesizeformat(value, binary: bool = ...): ...
 def do_pprint(value, verbose: bool = ...): ...
-def do_urlize(eval_ctx, value, trim_url_limit: Optional[Any] = ..., nofollow: bool = ..., target: Optional[Any] = ...): ...
+def do_urlize(eval_ctx, value, trim_url_limit: Any | None = ..., nofollow: bool = ..., target: Any | None = ...): ...
 def do_indent(s, width: int = ..., indentfirst: bool = ...): ...
 def do_truncate(s, length: int = ..., killwords: bool = ..., end: str = ...): ...
-def do_wordwrap(environment, s, width: int = ..., break_long_words: bool = ..., wrapstring: Optional[Any] = ...): ...
+def do_wordwrap(environment, s, width: int = ..., break_long_words: bool = ..., wrapstring: Any | None = ...): ...
 def do_wordcount(s): ...
 def do_int(value, default: int = ..., base: int = ...): ...
 def do_float(value, default: float = ...): ...
 def do_format(value, *args, **kwargs): ...
 def do_trim(value): ...
 def do_striptags(value): ...
-def do_slice(value, slices, fill_with: Optional[Any] = ...): ...
-def do_batch(value, linecount, fill_with: Optional[Any] = ...): ...
+def do_slice(value, slices, fill_with: Any | None = ...): ...
+def do_batch(value, linecount, fill_with: Any | None = ...): ...
 def do_round(value, precision: int = ..., method: str = ...): ...
 def do_groupby(environment, value, attribute): ...
 
@@ -41,7 +41,7 @@ class _GroupTuple(NamedTuple):
     grouper: Any
     list: Any
 
-def do_sum(environment, iterable, attribute: Optional[Any] = ..., start: int = ...): ...
+def do_sum(environment, iterable, attribute: Any | None = ..., start: int = ...): ...
 def do_list(value): ...
 def do_mark_safe(value): ...
 def do_mark_unsafe(value): ...

stubs/Jinja2/jinja2/lexer.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Tuple
+from typing import Any, Tuple
 
 whitespace_re: Any
 string_re: Any
@@ -112,6 +112,6 @@ class Lexer:
     keep_trailing_newline: Any
     rules: Any
     def __init__(self, environment) -> None: ...
-    def tokenize(self, source, name: Optional[Any] = ..., filename: Optional[Any] = ..., state: Optional[Any] = ...): ...
-    def wrap(self, stream, name: Optional[Any] = ..., filename: Optional[Any] = ...): ...
-    def tokeniter(self, source, name, filename: Optional[Any] = ..., state: Optional[Any] = ...): ...
+    def tokenize(self, source, name: Any | None = ..., filename: Any | None = ..., state: Any | None = ...): ...
+    def wrap(self, stream, name: Any | None = ..., filename: Any | None = ...): ...
+    def tokeniter(self, source, name, filename: Any | None = ..., state: Any | None = ...): ...

stubs/Jinja2/jinja2/loaders.pyi

@@ -1,6 +1,6 @@
 import sys
 from types import ModuleType
-from typing import Any, Callable, Iterable, List, Optional, Text, Tuple, Union
+from typing import Any, Callable, Iterable, List, Text, Tuple, Union
 
 from .environment import Environment
 
@@ -17,7 +17,7 @@ class BaseLoader:
     has_source_access: bool
     def get_source(self, environment, template): ...
     def list_templates(self): ...
-    def load(self, environment, name, globals: Optional[Any] = ...): ...
+    def load(self, environment, name, globals: Any | None = ...): ...
 
 class FileSystemLoader(BaseLoader):
     searchpath: Text
@@ -46,9 +46,7 @@ class DictLoader(BaseLoader):
 class FunctionLoader(BaseLoader):
     load_func: Any
     def __init__(self, load_func) -> None: ...
-    def get_source(
-        self, environment: Environment, template: Text
-    ) -> Tuple[Text, Optional[Text], Optional[Callable[..., Any]]]: ...
+    def get_source(self, environment: Environment, template: Text) -> Tuple[Text, Text | None, Callable[..., Any] | None]: ...
 
 class PrefixLoader(BaseLoader):
     mapping: Any
@@ -56,14 +54,14 @@ class PrefixLoader(BaseLoader):
     def __init__(self, mapping, delimiter: str = ...) -> None: ...
     def get_loader(self, template): ...
     def get_source(self, environment: Environment, template: Text) -> Tuple[Text, Text, Callable[..., Any]]: ...
-    def load(self, environment, name, globals: Optional[Any] = ...): ...
+    def load(self, environment, name, globals: Any | None = ...): ...
     def list_templates(self): ...
 
 class ChoiceLoader(BaseLoader):
     loaders: Any
     def __init__(self, loaders) -> None: ...
     def get_source(self, environment: Environment, template: Text) -> Tuple[Text, Text, Callable[..., Any]]: ...
-    def load(self, environment, name, globals: Optional[Any] = ...): ...
+    def load(self, environment, name, globals: Any | None = ...): ...
     def list_templates(self): ...
 
 class _TemplateModule(ModuleType): ...
@@ -77,4 +75,4 @@ class ModuleLoader(BaseLoader):
     def get_template_key(name): ...
     @staticmethod
     def get_module_filename(name): ...
-    def load(self, environment, name, globals: Optional[Any] = ...): ...
+    def load(self, environment, name, globals: Any | None = ...): ...

stubs/Jinja2/jinja2/parser.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 class Parser:
     environment: Any
@@ -8,13 +8,13 @@ class Parser:
     closed: bool
     extensions: Any
     def __init__(
-        self, environment, source, name: Optional[Any] = ..., filename: Optional[Any] = ..., state: Optional[Any] = ...
+        self, environment, source, name: Any | None = ..., filename: Any | None = ..., state: Any | None = ...
     ) -> None: ...
-    def fail(self, msg, lineno: Optional[Any] = ..., exc: Any = ...): ...
-    def fail_unknown_tag(self, name, lineno: Optional[Any] = ...): ...
-    def fail_eof(self, end_tokens: Optional[Any] = ..., lineno: Optional[Any] = ...): ...
-    def is_tuple_end(self, extra_end_rules: Optional[Any] = ...): ...
-    def free_identifier(self, lineno: Optional[Any] = ...): ...
+    def fail(self, msg, lineno: Any | None = ..., exc: Any = ...): ...
+    def fail_unknown_tag(self, name, lineno: Any | None = ...): ...
+    def fail_eof(self, end_tokens: Any | None = ..., lineno: Any | None = ...): ...
+    def is_tuple_end(self, extra_end_rules: Any | None = ...): ...
+    def free_identifier(self, lineno: Any | None = ...): ...
     def parse_statement(self): ...
     def parse_statements(self, end_tokens, drop_needle: bool = ...): ...
     def parse_set(self): ...
@@ -31,7 +31,7 @@ class Parser:
     def parse_filter_block(self): ...
     def parse_macro(self): ...
     def parse_print(self): ...
-    def parse_assign_target(self, with_tuple: bool = ..., name_only: bool = ..., extra_end_rules: Optional[Any] = ...): ...
+    def parse_assign_target(self, with_tuple: bool = ..., name_only: bool = ..., extra_end_rules: Any | None = ...): ...
     def parse_expression(self, with_condexpr: bool = ...): ...
     def parse_condexpr(self): ...
     def parse_or(self): ...
@@ -52,7 +52,7 @@ class Parser:
         self,
         simplified: bool = ...,
         with_condexpr: bool = ...,
-        extra_end_rules: Optional[Any] = ...,
+        extra_end_rules: Any | None = ...,
         explicit_parentheses: bool = ...,
     ): ...
     def parse_list(self): ...
@@ -64,5 +64,5 @@ class Parser:
     def parse_call(self, node): ...
     def parse_filter(self, node, start_inline: bool = ...): ...
     def parse_test(self, node): ...
-    def subparse(self, end_tokens: Optional[Any] = ...): ...
+    def subparse(self, end_tokens: Any | None = ...): ...
     def parse(self): ...

stubs/Jinja2/jinja2/runtime.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Text, Union
+from typing import Any, Dict, Text
 
 from jinja2.environment import Environment
 from jinja2.exceptions import TemplateNotFound as TemplateNotFound, TemplateRuntimeError as TemplateRuntimeError
@@ -15,7 +15,7 @@ class TemplateReference:
     def __getitem__(self, name): ...
 
 class Context:
-    parent: Union[Context, Dict[str, Any]]
+    parent: Context | Dict[str, Any]
     vars: Dict[str, Any]
     environment: Environment
     eval_ctx: Any
@@ -23,15 +23,15 @@ class Context:
     name: Text
     blocks: Dict[str, Any]
     def __init__(
-        self, environment: Environment, parent: Union[Context, Dict[str, Any]], name: Text, blocks: Dict[str, Any]
+        self, environment: Environment, parent: Context | Dict[str, Any], name: Text, blocks: Dict[str, Any]
     ) -> None: ...
     def super(self, name, current): ...
-    def get(self, key, default: Optional[Any] = ...): ...
+    def get(self, key, default: Any | None = ...): ...
     def resolve(self, key): ...
     def get_exported(self): ...
     def get_all(self): ...
     def call(__self, __obj, *args, **kwargs): ...
-    def derived(self, locals: Optional[Any] = ...): ...
+    def derived(self, locals: Any | None = ...): ...
     keys: Any
     values: Any
     items: Any
@@ -51,7 +51,7 @@ class BlockReference:
 class LoopContext:
     index0: int
     depth0: Any
-    def __init__(self, iterable, recurse: Optional[Any] = ..., depth0: int = ...) -> None: ...
+    def __init__(self, iterable, recurse: Any | None = ..., depth0: int = ...) -> None: ...
     def cycle(self, *args): ...
     first: Any
     last: Any
@@ -83,7 +83,7 @@ class Macro:
     def __call__(self, *args, **kwargs): ...
 
 class Undefined:
-    def __init__(self, hint: Optional[Any] = ..., obj: Any = ..., name: Optional[Any] = ..., exc: Any = ...) -> None: ...
+    def __init__(self, hint: Any | None = ..., obj: Any = ..., name: Any | None = ..., exc: Any = ...) -> None: ...
     def __getattr__(self, name): ...
     __add__: Any
     __radd__: Any
@@ -118,7 +118,7 @@ class Undefined:
     def __nonzero__(self): ...
     __bool__: Any
 
-def make_logging_undefined(logger: Optional[Any] = ..., base: Optional[Any] = ...): ...
+def make_logging_undefined(logger: Any | None = ..., base: Any | None = ...): ...
 
 class DebugUndefined(Undefined): ...
 

stubs/Jinja2/jinja2/utils.pyi

@@ -1,5 +1,5 @@
 from _typeshed import StrOrBytesPath
-from typing import IO, Any, Callable, Iterable, Optional, Protocol, Text, TypeVar, Union
+from typing import IO, Any, Callable, Iterable, Protocol, Text, TypeVar
 from typing_extensions import Literal
 
 from markupsafe import Markup as Markup, escape as escape, soft_unicode as soft_unicode
@@ -36,16 +36,13 @@ def select_autoescape(
 def consume(iterable: Iterable[object]) -> None: ...
 def clear_caches() -> None: ...
 def import_string(import_name: str, silent: bool = ...) -> Any: ...
-def open_if_exists(filename: StrOrBytesPath, mode: str = ...) -> Optional[IO[Any]]: ...
+def open_if_exists(filename: StrOrBytesPath, mode: str = ...) -> IO[Any] | None: ...
 def object_type_repr(obj: object) -> str: ...
 def pformat(obj: object, verbose: bool = ...) -> str: ...
 def urlize(
-    text: Union[Markup, Text],
-    trim_url_limit: Optional[int] = ...,
-    rel: Optional[Union[Markup, Text]] = ...,
-    target: Optional[Union[Markup, Text]] = ...,
+    text: Markup | Text, trim_url_limit: int | None = ..., rel: Markup | Text | None = ..., target: Markup | Text | None = ...
 ) -> str: ...
-def generate_lorem_ipsum(n: int = ..., html: bool = ..., min: int = ..., max: int = ...) -> Union[Markup, str]: ...
+def generate_lorem_ipsum(n: int = ..., html: bool = ..., min: int = ..., max: int = ...) -> Markup | str: ...
 def unicode_urlencode(obj: object, charset: str = ..., for_qs: bool = ...) -> str: ...
 
 class LRUCache:
@@ -53,8 +50,8 @@ class LRUCache:
     def __init__(self, capacity) -> None: ...
     def __getnewargs__(self): ...
     def copy(self): ...
-    def get(self, key, default: Optional[Any] = ...): ...
-    def setdefault(self, key, default: Optional[Any] = ...): ...
+    def get(self, key, default: Any | None = ...): ...
+    def setdefault(self, key, default: Any | None = ...): ...
     def clear(self): ...
     def __contains__(self, key): ...
     def __len__(self): ...