Skip to content

Fix handling of SystemExit #466

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

Merged
merged 2 commits into from
Jul 8, 2021
Merged

Fix handling of SystemExit #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1643d94
Fix handling of SystemExit
jonathanslenders Jul 8, 2021
43e40cf
Fix for black integration. Use black.Mode instead of black.FileMode.
jonathanslenders Jul 8, 2021
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
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
sudo apt remove python3-pip
python -m pip install --upgrade pip
python -m pip install . black isort mypy pytest readme_renderer
python -m pip install . types-dataclasses # Needed for Python 3.6
pip list
- name: Type Checker
run: |
Expand Down
6 changes: 2 additions & 4 deletions ptpython/repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def run_and_show_expression(self, expression):
except KeyboardInterrupt: # KeyboardInterrupt doesn't inherit from Exception.
raise
except SystemExit:
return
raise
except BaseException as e:
self._handle_exception(e)
else:
Expand Down Expand Up @@ -330,9 +330,7 @@ def _format_result_output(self, result: object) -> StyleAndTextTuples:
else:
result_repr = black.format_str(
result_repr,
mode=black.FileMode(
line_length=self.app.output.get_size().columns
),
mode=black.Mode(line_length=self.app.output.get_size().columns),
)

formatted_result_repr = to_formatted_text(
Expand Down