Merge branch 'master' into pre-commit-ci-update-config

python-trio · Oct 23, 2023 · 69327e2 · 69327e2
2 parents 54d6d2e + a0c480a
commit 69327e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/check.sh b/check.sh
@@ -39,7 +39,7 @@ if ! ruff check .; then
     echo "* ruff found issues." >> "$GITHUB_STEP_SUMMARY"
     EXIT_STATUS=1
     if $ON_GITHUB_CI; then
-        ruff check --format github --diff .
+        ruff check --output-format github --diff .
     else
         ruff check --diff .
     fi

diff --git a/trio/_threads.py b/trio/_threads.py
@@ -409,10 +409,10 @@ def from_thread_check_cancelled() -> None:
     """
     try:
         raise_cancel = PARENT_TASK_DATA.cancel_register[0]
-    except AttributeError:
+    except AttributeError as exc:
         raise RuntimeError(
             "this thread wasn't created by Trio, can't check for cancellation"
-        ) from None
+        ) from exc
     if raise_cancel is not None:
         raise_cancel()