Rebase correctly

tests/test_config.py

@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import configparser
+import io
 import json
 import logging
 import os
@@ -367,22 +371,18 @@ def test_log_config_yaml(
     mocked_logging_config_module.dictConfig.assert_called_once_with(logging_config)
 
 
-@pytest.mark.parametrize(
-    "config_file", ["log_config.ini", configparser.ConfigParser(), io.StringIO()]
-)
+@pytest.mark.parametrize("config_file", ["log_config.ini", configparser.ConfigParser(), io.StringIO()])
 def test_log_config_file(
     mocked_logging_config_module: MagicMock,
-    config_file: typing.Union[str, configparser.RawConfigParser, typing.IO],
+    config_file: str | configparser.RawConfigParser | typing.IO[Any],
 ) -> None:
     """
     Test that one can load a configparser config from disk.
     """
     config = Config(app=asgi_app, log_config=config_file)
     config.load()
 
-    mocked_logging_config_module.fileConfig.assert_called_once_with(
-        "log_config", disable_existing_loggers=False
-    )
+    mocked_logging_config_module.fileConfig.assert_called_once_with(config_file, disable_existing_loggers=False)
 
 
 @pytest.fixture(params=[0, 1])

uvicorn/config.py

@@ -11,19 +11,12 @@
 import sys
 from configparser import RawConfigParser
 from pathlib import Path
-from typing import Any, Awaitable, Callable, Literal
 from typing import (
     IO,
     Any,
     Awaitable,
     Callable,
-    Dict,
-    List,
     Literal,
-    Optional,
-    Tuple,
-    Type,
-    Union,
 )
 
 import click
@@ -380,9 +373,7 @@ def configure_logging(self) -> None:
                 with open(self.log_config) as file:
                     loaded_config = json.load(file)
                     logging.config.dictConfig(loaded_config)
-            elif isinstance(self.log_config, str) and self.log_config.endswith(
-                (".yaml", ".yml")
-            ):
+            elif isinstance(self.log_config, str) and self.log_config.endswith((".yaml", ".yml")):
                 # Install the PyYAML package or the uvicorn[standard] optional
                 # dependencies to enable this functionality.
                 import yaml

uvicorn/main.py

@@ -7,7 +7,7 @@
 import platform
 import ssl
 import sys
-from typing import Any, Callable, IO
+from typing import IO, Any, Callable
 
 import click