summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/OutputWindow.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 02:23:33 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-09-26 02:23:33 (GMT)
commit9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce (patch)
treea8b861f3d9c69a6370c0bea690d377cdee93787a /Lib/idlelib/OutputWindow.py
parent0931ba2259a5b7eb1d8252639bb6748e32a647f8 (diff)
parent58b07a605d7f5194df2978cfc81c598730dc84d6 (diff)
downloadcpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.zip
cpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.tar.gz
cpython-9cd90ccaae9d3a874db56ec8cb25bf8aec30a2ce.tar.bz2
Merge with 3.5
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 9dacc49..e614f9b 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)