summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/replace.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-05-28 17:22:31 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-05-28 17:22:31 (GMT)
commit6fa5bdc6e85ec48925bc0d856b134f59d01c300f (patch)
tree8fb1448859375e577abfa091437f1da2b4816e86 /Lib/idlelib/replace.py
parent0d9220e162f1e5f8caa3d7ebaa54665776d361a1 (diff)
downloadcpython-6fa5bdc6e85ec48925bc0d856b134f59d01c300f.zip
cpython-6fa5bdc6e85ec48925bc0d856b134f59d01c300f.tar.gz
cpython-6fa5bdc6e85ec48925bc0d856b134f59d01c300f.tar.bz2
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/replace.py')
-rw-r--r--Lib/idlelib/replace.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py
index f2ea22e..589b814 100644
--- a/Lib/idlelib/replace.py
+++ b/Lib/idlelib/replace.py
@@ -5,8 +5,8 @@ replace+find.
"""
from tkinter import *
-from idlelib import SearchEngine
-from idlelib.SearchDialogBase import SearchDialogBase
+from idlelib import searchengine
+from idlelib.searchbase import SearchDialogBase
import re
@@ -14,7 +14,7 @@ def replace(text):
"""Returns a singleton ReplaceDialog instance.The single dialog
saves user entries and preferences across instances."""
root = text._root()
- engine = SearchEngine.get(root)
+ engine = searchengine.get(root)
if not hasattr(engine, "_replacedialog"):
engine._replacedialog = ReplaceDialog(root, engine)
dialog = engine._replacedialog
@@ -164,7 +164,7 @@ class ReplaceDialog(SearchDialogBase):
pos = None
if not pos:
first = last = pos = text.index("insert")
- line, col = SearchEngine.get_line_col(pos)
+ line, col = searchengine.get_line_col(pos)
chars = text.get("%d.0" % line, "%d.0" % (line+1))
m = prog.match(chars, col)
if not prog: