From: Ned Deily <nad@python.org>
Date: Sat, 4 Jun 2016 00:50:44 +0000 (-0700)
Subject: Issue #24225: Fix additional renamed module references.
X-Git-Tag: v3.6.0a2~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=622b2f6ec90e071e9fe0e34a49a7b1218d4a7121;p=python

Issue #24225: Fix additional renamed module references.
---

diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index 1e16f2c586..618cc2631b 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -155,7 +155,7 @@ def overrideRootMenu(root, flist):
         if end > 0:
             menu.delete(0, end)
         windows.add_windows_to_menu(menu)
-    Windows.register_callback(postwindowsmenu)
+    windows.register_callback(postwindowsmenu)
 
     def about_dialog(event=None):
         "Handle Help 'About IDLE' event."
diff --git a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py
index 8b8beb93d0..5e9305a9d5 100644
--- a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py
+++ b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py
@@ -70,6 +70,6 @@ for idx, value in enumerate(sys.argv):
 # Now it is safe to import idlelib.
 from idlelib import macosxSupport
 macosxSupport._appbundle = True
-from idlelib.PyShell import main
+from idlelib.pyshell import main
 if __name__ == '__main__':
     main()
diff --git a/Tools/scripts/idle3 b/Tools/scripts/idle3
index 8ee92c2afe..d7332bca48 100755
--- a/Tools/scripts/idle3
+++ b/Tools/scripts/idle3
@@ -1,5 +1,5 @@
 #! /usr/bin/env python3
 
-from idlelib.PyShell import main
+from idlelib.pyshell import main
 if __name__ == '__main__':
     main()