[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4 Issue#16233

[terry.reedy]

https://hg.python.org/cpython/rev/14e62e632fbe
changeset:   93090:14e62e632fbe
parent:      93085:030fda7b1de8
parent:      93089:dd3c0ea52106
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Oct 15 22:01:58 2014 -0400
summary:
  Merge with 3.4 Issue#16233

files:
  Lib/idlelib/EditorWindow.py |  13 ++++++-------
  1 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -689,16 +689,15 @@
             self.flist.open(file_path)
         else:
             self.io.loadfile(file_path)
+        return file_path
 
     def open_class_browser(self, event=None):
         filename = self.io.filename
-        if not filename:
-            tkMessageBox.showerror(
-                "No filename",
-                "This buffer has no associated filename",
-                master=self.text)
-            self.text.focus_set()
-            return None
+        if not (self.__class__.__name__ == 'PyShellEditorWindow'
+                and filename):
+            filename = self.open_module()
+            if filename is None:
+                return
         head, tail = os.path.split(filename)
         base, ext = os.path.splitext(tail)
         from idlelib import ClassBrowser

-- 
Repository URL: https://hg.python.org/cpython