diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-09-26 02:23:33 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-09-26 02:23:33 (GMT) |
| commit | 9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce (patch) | |
| tree | a8b861f3d9c69a6370c0bea690d377cdee93787a /Lib/idlelib/PyShell.py | |
| parent | 0931ba2259a5b7eb1d8252639bb6748e32a647f8 (diff) | |
| parent | 58b07a605d7f5194df2978cfc81c598730dc84d6 (diff) | |
| download | cpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.zip cpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.tar.gz cpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'Lib/idlelib/PyShell.py')
| -rwxr-xr-x | Lib/idlelib/PyShell.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 6bbd456..57aa6da 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -774,7 +774,7 @@ class ModifiedInterpreter(InteractiveInterpreter): "Exit?", "Do you want to exit altogether?", default="yes", - master=self.tkconsole.text): + parent=self.tkconsole.text): raise else: self.showtraceback() @@ -812,7 +812,7 @@ class ModifiedInterpreter(InteractiveInterpreter): "Run IDLE with the -n command line switch to start without a " "subprocess and refer to Help/IDLE Help 'Running without a " "subprocess' for further details.", - master=self.tkconsole.text) + parent=self.tkconsole.text) def display_no_subprocess_error(self): tkMessageBox.showerror( @@ -820,14 +820,14 @@ class ModifiedInterpreter(InteractiveInterpreter): "IDLE's subprocess didn't make connection. Either IDLE can't " "start a subprocess or personal firewall software is blocking " "the connection.", - master=self.tkconsole.text) + parent=self.tkconsole.text) def display_executing_dialog(self): tkMessageBox.showerror( "Already executing", "The Python Shell window is already executing a command; " "please wait until it is finished.", - master=self.tkconsole.text) + parent=self.tkconsole.text) class PyShell(OutputWindow): @@ -931,7 +931,7 @@ class PyShell(OutputWindow): if self.executing: tkMessageBox.showerror("Don't debug now", "You can only toggle the debugger when idle", - master=self.text) + parent=self.text) self.set_debugger_indicator() return "break" else: @@ -1239,7 +1239,7 @@ class PyShell(OutputWindow): tkMessageBox.showerror("No stack trace", "There is no stack trace yet.\n" "(sys.last_traceback is not defined)", - master=self.text) + parent=self.text) return from idlelib.StackViewer import StackBrowser StackBrowser(self.root, self.flist) |