Skip to content

Handle asyncio.CancelledError in SSH session interaction #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnyanesh1011 wants to merge 3 commits into
base: main
Choose a base branch
from
+8 −1
Open

Handle asyncio.CancelledError in SSH session interaction #2072

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f018e54
Handle CancelledError in SSH interact session
dnyanesh1011 May 18, 2026
9a75cf7
Fix trailing newline
dnyanesh1011 May 18, 2026
6d54a90
Handle CancelledError in SSH interaction
dnyanesh1011 May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/prompt_toolkit/contrib/ssh/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,17 @@ async def _interact(self) -> None:
with create_pipe_input() as self._input:
with create_app_session(input=self._input, output=self._output) as session:
self.app_session = session

try:
await self.interact(self)
except BaseException:

except asyncio.CancelledError:
# Expected during disconnect/shutdown.
pass
Copy link
Copy Markdown
Member

@jonathanslenders jonathanslenders May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you propagate rather than suppress using raise instead of pass?

Copy link
Copy Markdown
Author

@dnyanesh1011 dnyanesh1011 May 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I updated the handler so asyncio.CancelledError is now re-raised instead of being swallowed. Regular application exceptions are still handled separately, so cancellation behavior stays intact without mixing it into normal error handling


except Exception:
traceback.print_exc()

finally:
# Close the connection.
self._chan.close()
Expand Down
Loading