diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 20:40:20 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 20:40:20 (GMT) |
| commit | 4c6daf10372af41d4b48dd1ac65d737c64c2d41c (patch) | |
| tree | 1c09beb9cb50131295da68818734d18e39b1941d /Lib/idlelib/GrepDialog.py | |
| parent | b55d36805566c092c11b8e38792c759742cd6a1f (diff) | |
| download | cpython-4c6daf10372af41d4b48dd1ac65d737c64c2d41c.zip cpython-4c6daf10372af41d4b48dd1ac65d737c64c2d41c.tar.gz cpython-4c6daf10372af41d4b48dd1ac65d737c64c2d41c.tar.bz2 | |
Merged revisions 79576-79578 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79576 | florent.xicluna | 2010-04-02 10:24:52 +0300 (Fri, 02 Apr 2010) | 2 lines
#7092: Fix additional "-3" warnings in the idlelib package, and convert to absolute imports.
........
r79577 | florent.xicluna | 2010-04-02 11:15:26 +0300 (Fri, 02 Apr 2010) | 2 lines
#7092: Drop the cmp argument.
........
r79578 | florent.xicluna | 2010-04-02 11:30:21 +0300 (Fri, 02 Apr 2010) | 2 lines
#7092: silence some py3k warnings
........
Diffstat (limited to 'Lib/idlelib/GrepDialog.py')
| -rw-r--r-- | Lib/idlelib/GrepDialog.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/GrepDialog.py b/Lib/idlelib/GrepDialog.py index ab136bc..e40e546 100644 --- a/Lib/idlelib/GrepDialog.py +++ b/Lib/idlelib/GrepDialog.py @@ -2,8 +2,8 @@ import os import fnmatch import sys from Tkinter import * -import SearchEngine -from SearchDialogBase import SearchDialogBase +from idlelib import SearchEngine +from idlelib.SearchDialogBase import SearchDialogBase def grep(text, io=None, flist=None): root = text._root() @@ -63,7 +63,7 @@ class GrepDialog(SearchDialogBase): if not path: self.top.bell() return - from OutputWindow import OutputWindow + from idlelib.OutputWindow import OutputWindow save = sys.stdout try: sys.stdout = OutputWindow(self.flist) |