p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #32363 -- Made shell ignore a missing sys.___interactivehook__. 

Thanks Tim Graham for the report.

Follow up to 1bbb98d9a4.
This commit is contained in:
Peter Inglesby 2021-09-05 20:38:36 +01:00 committed by Mariusz Felisiak
parent a7f27fca52
commit 3921b1c6d2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/core/management/commands/shell.py
View File

@ -66,12 +66,20 @@ class Command(BaseCommand):
# write history to the .python_history file, but this can be overridden by # write history to the .python_history file, but this can be overridden by
# $PYTHONSTARTUP or ~/.pythonrc.py. # $PYTHONSTARTUP or ~/.pythonrc.py.
try: try:
sys.__interactivehook__() hook = sys.__interactivehook__
except Exception: except AttributeError:
# Match the behavior of the cpython shell where an error in # Match the behavior of the cpython shell where a missing
# sys.__interactivehook__ prints a warning and the exception and continues. # sys.__interactivehook__ is ignored.
print("Failed calling sys.__interactivehook__") pass
traceback.print_exc() else:
try:
hook()
except Exception:
# Match the behavior of the cpython shell where an error in
# sys.__interactivehook__ prints a warning and the exception
# and continues.
print('Failed calling sys.__interactivehook__')
traceback.print_exc()
# Set up tab completion for objects imported by $PYTHONSTARTUP or # Set up tab completion for objects imported by $PYTHONSTARTUP or
# ~/.pythonrc.py. # ~/.pythonrc.py.