[pull] main from pallets:main

.github/workflows/tests.yaml

@@ -21,6 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - {python: '3.13'}
           - {python: '3.12'}
           - {name: Windows, python: '3.12', os: windows-latest}
           - {name: Mac, python: '3.12', os: macos-latest}

pyproject.toml

@@ -79,9 +79,6 @@ strict = true
 module = [
     "colorama.*",
     "cryptography.*",
-    "eventlet.*",
-    "gevent.*",
-    "greenlet.*",
     "watchdog.*",
     "xprocess.*",
 ]

requirements/dev.txt

@@ -18,7 +18,7 @@ certifi==2024.2.2
     # via
     #   -r docs.txt
     #   requests
-cffi==1.16.0
+cffi @ https://github.com/python-cffi/cffi/archive/d7f750b1b1c5ea4da5aa537b9baba0e01b0ce843.zip
     # via
     #   -r tests.txt
     #   cryptography
@@ -46,8 +46,6 @@ filelock==3.13.3
     # via
     #   tox
     #   virtualenv
-greenlet==3.0.3
-    # via -r tests.txt
 identify==2.5.35
     # via pre-commit
 idna==3.6

requirements/tests.in

@@ -3,6 +3,7 @@ pytest-timeout
 # pinned for python 3.8 support
 pytest-xprocess<1
 cryptography
-greenlet
 watchdog
 ephemeral-port-reserve
+# pin current commit on main for python 3.13 support
+https://github.com/python-cffi/cffi/archive/d7f750b1b1c5ea4da5aa537b9baba0e01b0ce843.zip

requirements/tests.txt

@@ -4,14 +4,14 @@
 #
 #    pip-compile tests.in
 #
-cffi==1.16.0
-    # via cryptography
+cffi @ https://github.com/python-cffi/cffi/archive/d7f750b1b1c5ea4da5aa537b9baba0e01b0ce843.zip
+    # via
+    #   -r tests.in
+    #   cryptography
 cryptography==42.0.5
     # via -r tests.in
 ephemeral-port-reserve==1.1.4
     # via -r tests.in
-greenlet==3.0.3
-    # via -r tests.in
 iniconfig==2.0.0
     # via pytest
 packaging==24.0

src/werkzeug/debug/tbtools.py

@@ -296,7 +296,12 @@ def render_traceback_html(self, include_title: bool = True) -> str:
 
                 rows.append("\n".join(row_parts))
 
-        is_syntax_error = issubclass(self._te.exc_type, SyntaxError)
+        if sys.version_info < (3, 13):
+            exc_type_str = self._te.exc_type.__name__
+        else:
+            exc_type_str = self._te.exc_type_str
+
+        is_syntax_error = exc_type_str == "SyntaxError"
 
         if include_title:
             if is_syntax_error:
@@ -325,13 +330,19 @@ def render_debugger_html(
     ) -> str:
         exc_lines = list(self._te.format_exception_only())
         plaintext = "".join(self._te.format())
+
+        if sys.version_info < (3, 13):
+            exc_type_str = self._te.exc_type.__name__
+        else:
+            exc_type_str = self._te.exc_type_str
+
         return PAGE_HTML % {
             "evalex": "true" if evalex else "false",
             "evalex_trusted": "true" if evalex_trusted else "false",
             "console": "false",
             "title": escape(exc_lines[0]),
             "exception": escape("".join(exc_lines)),
-            "exception_type": escape(self._te.exc_type.__name__),
+            "exception_type": escape(exc_type_str),
             "summary": self.render_traceback_html(include_title=False),
             "plaintext": escape(plaintext),
             "plaintext_cs": re.sub("-{2,}", "-", plaintext),

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py3{12,11,10,9,8}
+    py3{13,12,11,10,9,8}
     pypy310
     style
     typing