[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4

Mon Sep 21 04:56:23 CEST 2015

https://hg.python.org/cpython/rev/84d500faf13c
changeset: 98102:84d500faf13c
branch: 3.5
parent: 98097:f4504ff121cc
parent: 98101:a2e782188db6
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Sep 20 22:55:51 2015 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/EditorWindow.py | 10 ++++++++--
 Lib/idlelib/macosxSupport.py | 7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -537,16 +537,22 @@
 return 'normal'
 
 def about_dialog(self, event=None):
+ "Handle Help 'About IDLE' event."
+ # Synchronize with macosxSupport.overrideRootMenu.about_dialog.
 aboutDialog.AboutDialog(self.top,'About IDLE')
 
 def config_dialog(self, event=None):
+ "Handle Options 'Configure IDLE' event."
+ # Synchronize with macosxSupport.overrideRootMenu.config_dialog.
 configDialog.ConfigDialog(self.top,'Settings')
+
 def config_extensions_dialog(self, event=None):
+ "Handle Options 'Configure Extensions' event."
 configDialog.ConfigExtensionsDialog(self.top)
 
 def help_dialog(self, event=None):
- "Handle help doc event."
- # edit maxosxSupport.overrideRootMenu.help_dialog to match
+ "Handle Help 'IDLE Help' event."
+ # Synchronize with macosxSupport.overrideRootMenu.help_dialog.
 if self.root:
 parent = self.root
 else:
diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py
--- a/Lib/idlelib/macosxSupport.py
+++ b/Lib/idlelib/macosxSupport.py
@@ -159,10 +159,14 @@
 WindowList.register_callback(postwindowsmenu)
 
 def about_dialog(event=None):
+ "Handle Help 'About IDLE' event."
+ # Synchronize with EditorWindow.EditorWindow.about_dialog.
 from idlelib import aboutDialog
 aboutDialog.AboutDialog(root, 'About IDLE')
 
 def config_dialog(event=None):
+ "Handle Options 'Configure IDLE' event."
+ # Synchronize with EditorWindow.EditorWindow.config_dialog.
 from idlelib import configDialog
 
 # Ensure that the root object has an instance_dict attribute,
@@ -170,10 +174,11 @@
 # on an EditorWindow instance that is then passed as the first
 # argument to ConfigDialog)
 root.instance_dict = flist.inversedict
- root.instance_dict = flist.inversedict
 configDialog.ConfigDialog(root, 'Settings')
 
 def help_dialog(event=None):
+ "Handle Help 'IDLE Help' event."
+ # Synchronize with EditorWindow.EditorWindow.help_dialog.
 from idlelib import help
 help.show_idlehelp(root)
 
-- 
Repository URL: https://hg.python.org/cpython
