Skip to content

Python 3: Write syntax errors and tracebacks to python console #9767

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
michaelDCurran merged 1 commit into from
Jun 21, 2019
Merged

Python 3: Write syntax errors and tracebacks to python console #9767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions source/pythonConsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#A part of NonVisual Desktop Access (NVDA)
#This file is covered by the GNU General Public License.
#See the file COPYING for more details.
#Copyright (C) 2008-2017 NV Access Limited
#Copyright (C) 2008-2019 NV Access Limited, Leonard de Ruijter

import watchdog

Expand Down Expand Up @@ -99,8 +99,7 @@ def __init__(self, outputFunc, setPromptFunc, exitFunc, echoFunc=None, **kwargs)
#: @type: dict
self._namespaceSnapshotVars = None

# Can't use super here because stupid code.InteractiveConsole doesn't sub-class object. Grrr!
code.InteractiveConsole.__init__(self, locals=self.namespace, **kwargs)
super().__init__(locals=self.namespace, **kwargs)
self.prompt = ">>>"

def _set_prompt(self, prompt):
Expand All @@ -121,12 +120,24 @@ def push(self, line):
sys.stdout = sys.stderr = self
# Prevent this from messing with the gettext "_" builtin.
saved_ = builtins._
more = code.InteractiveConsole.push(self, line)
more = super().push(line)
sys.stdout, sys.stderr = stdout, stderr
builtins._ = saved_
self.prompt = "..." if more else ">>>"
return more

def showsyntaxerror(self, filename=None):
excepthook = sys.excepthook
sys.excepthook = sys.__excepthook__
super().showsyntaxerror(filename=filename)
sys.excepthook = excepthook

def showtraceback(self):
excepthook = sys.excepthook
sys.excepthook = sys.__excepthook__
super().showtraceback()
sys.excepthook = excepthook

def updateNamespaceSnapshotVars(self):
"""Update the console namespace with a snapshot of NVDA's current state.
This creates/updates variables for the current focus, navigator object, etc.
Expand Down