summaryrefslogtreecommitdiff
path: root/Lib/idlelib/OutputWindow.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-09-25 22:23:19 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2015-09-25 22:23:19 -0400
commit58b07a605d7f5194df2978cfc81c598730dc84d6 (patch)
treeaf5655cb279f0d150cf5be8e037f585c9023e360 /Lib/idlelib/OutputWindow.py
parent429f28d1ae6f5024431c86a4b9a7771c5a32120d (diff)
parent3be2e54adcc5c8fd87f5f21e09ee4a85d230f8c5 (diff)
downloadcpython-git-58b07a605d7f5194df2978cfc81c598730dc84d6.tar.gz
Merge with 3.4
Diffstat (limited to 'Lib/idlelib/OutputWindow.py')
-rw-r--r--Lib/idlelib/OutputWindow.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
index 9dacc492b5..e614f9b2bb 100644
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -91,7 +91,7 @@ class OutputWindow(EditorWindow):
"No special line",
"The line you point at doesn't look like "
"a valid file name followed by a line number.",
- master=self.text)
+ parent=self.text)
return
filename, lineno = result
edit = self.flist.open(filename)