main commit

venv/lib/python3.12/site-packages/starlette/middleware/errors.py

@@ -1,15 +1,13 @@
-from __future__ import annotations
-
 import html
 import inspect
-import sys
 import traceback
+import typing
 
 from starlette._utils import is_async_callable
 from starlette.concurrency import run_in_threadpool
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, PlainTextResponse, Response
-from starlette.types import ASGIApp, ExceptionHandler, Message, Receive, Scope, Send
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
 STYLES = """
 p {
@@ -139,7 +137,7 @@ class ServerErrorMiddleware:
     def __init__(
         self,
         app: ASGIApp,
-        handler: ExceptionHandler | None = None,
+        handler: typing.Optional[typing.Callable] = None,
         debug: bool = False,
     ) -> None:
         self.app = app
@@ -185,7 +183,9 @@ class ServerErrorMiddleware:
             # to optionally raise the error within the test case.
             raise exc
 
-    def format_line(self, index: int, line: str, frame_lineno: int, frame_index: int) -> str:
+    def format_line(
+        self, index: int, line: str, frame_lineno: int, frame_index: int
+    ) -> str:
         values = {
             # HTML escape - line could contain < or >
             "line": html.escape(line).replace(" ", "&nbsp"),
@@ -199,10 +199,7 @@ class ServerErrorMiddleware:
     def generate_frame_html(self, frame: inspect.FrameInfo, is_collapsed: bool) -> str:
         code_context = "".join(
             self.format_line(
-                index,
-                line,
-                frame.lineno,
-                frame.index,  # type: ignore[arg-type]
+                index, line, frame.lineno, frame.index  # type: ignore[arg-type]
             )
             for index, line in enumerate(frame.code_context or [])
         )
@@ -222,7 +219,9 @@ class ServerErrorMiddleware:
         return FRAME_TEMPLATE.format(**values)
 
     def generate_html(self, exc: Exception, limit: int = 7) -> str:
-        traceback_obj = traceback.TracebackException.from_exception(exc, capture_locals=True)
+        traceback_obj = traceback.TracebackException.from_exception(
+            exc, capture_locals=True
+        )
 
         exc_html = ""
         is_collapsed = False
@@ -233,13 +232,11 @@ class ServerErrorMiddleware:
                 exc_html += self.generate_frame_html(frame, is_collapsed)
                 is_collapsed = True
 
-        if sys.version_info >= (3, 13):  # pragma: no cover
-            exc_type_str = traceback_obj.exc_type_str
-        else:  # pragma: no cover
-            exc_type_str = traceback_obj.exc_type.__name__
-
         # escape error class and text
-        error = f"{html.escape(exc_type_str)}: {html.escape(str(traceback_obj))}"
+        error = (
+            f"{html.escape(traceback_obj.exc_type.__name__)}: "
+            f"{html.escape(str(traceback_obj))}"
+        )
 
         return TEMPLATE.format(styles=STYLES, js=JS, error=error, exc_html=exc_html)