summaryrefslogtreecommitdiff
path: root/Lib/idlelib/browser.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-05-28 13:22:31 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2016-05-28 13:22:31 -0400
commit6fa5bdc6e85ec48925bc0d856b134f59d01c300f (patch)
tree8fb1448859375e577abfa091437f1da2b4816e86 /Lib/idlelib/browser.py
parent0d9220e162f1e5f8caa3d7ebaa54665776d361a1 (diff)
downloadcpython-git-6fa5bdc6e85ec48925bc0d856b134f59d01c300f.tar.gz
Issue #24225: Within idlelib files, update idlelib module names.
This follows the previous patch that changed idlelib file names. Class names that matched old module names are not changed. Change idlelib imports in turtledemo.__main__. Exception: config-extensions.def. Previously, extension section names, file names, and class names had to match. Changing section names would create cross-version conflicts in config-extensions.cfg (user customizations). Instead map old names to new file names at point of import in editor.EditorWindow.load_extension. Patch extensively tested with test_idle, idle_test.htest.py, a custom import-all test, running IDLE in a console to catch messages, and testing each menu item. Based on a patch by Al Sweigart.
Diffstat (limited to 'Lib/idlelib/browser.py')
-rw-r--r--Lib/idlelib/browser.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py
index d09c52fe4d..9968333c24 100644
--- a/Lib/idlelib/browser.py
+++ b/Lib/idlelib/browser.py
@@ -14,13 +14,13 @@ import os
import sys
import pyclbr
-from idlelib import PyShell
-from idlelib.WindowList import ListedToplevel
-from idlelib.TreeWidget import TreeNode, TreeItem, ScrolledCanvas
-from idlelib.configHandler import idleConf
+from idlelib import pyshell
+from idlelib.windows import ListedToplevel
+from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
+from idlelib.config import idleConf
file_open = None # Method...Item and Class...Item use this.
-# Normally PyShell.flist.open, but there is no PyShell.flist for htest.
+# Normally pyshell.flist.open, but there is no pyshell.flist for htest.
class ClassBrowser:
@@ -32,7 +32,7 @@ class ClassBrowser:
"""
global file_open
if not _htest:
- file_open = PyShell.flist.open
+ file_open = pyshell.flist.open
self.name = name
self.file = os.path.join(path[0], self.name + ".py")
self._htest = _htest
@@ -95,7 +95,7 @@ class ModuleBrowserTreeItem(TreeItem):
return
if not os.path.exists(self.file):
return
- PyShell.flist.open(self.file)
+ pyshell.flist.open(self.file)
def IsExpandable(self):
return os.path.normcase(self.file[-3:]) == ".py"
@@ -226,7 +226,7 @@ def _class_browser(parent): #Wrapper for htest
file = sys.argv[0]
dir, file = os.path.split(file)
name = os.path.splitext(file)[0]
- flist = PyShell.PyShellFileList(parent)
+ flist = pyshell.PyShellFileList(parent)
global file_open
file_open = flist.open
ClassBrowser(flist, name, [dir], _htest=True)