[Python-checkins] r64893 - in sandbox/trunk/ttk-gsoc/src/idlelib: IOBinding.py Percolator.py PyShell.py
guilherme.polo
python-checkins at python.org
Sat Jul 12 17:26:31 CEST 2008
Author: guilherme.polo
Date: Sat Jul 12 17:26:22 2008
New Revision: 64893
Log:
Removed "from Tkinter import *" from the remaining modules (except EditorWindow) and reorganized PyShell imports
Modified:
sandbox/trunk/ttk-gsoc/src/idlelib/IOBinding.py
sandbox/trunk/ttk-gsoc/src/idlelib/Percolator.py
sandbox/trunk/ttk-gsoc/src/idlelib/PyShell.py
Modified: sandbox/trunk/ttk-gsoc/src/idlelib/IOBinding.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/idlelib/IOBinding.py (original)
+++ sandbox/trunk/ttk-gsoc/src/idlelib/IOBinding.py Sat Jul 12 17:26:22 2008
@@ -6,20 +6,20 @@
# which will only understand the local convention.
import os
-import types
+import re
import sys
+import types
import codecs
import tempfile
import tkFileDialog
import tkMessageBox
-import re
-from Tkinter import *
+from Tkinter import Toplevel, Entry, Frame, Button, Label
+from Tkconstants import W, X, TOP, LEFT, BOTH
from SimpleDialog import SimpleDialog
from configHandler import idleConf
-
if idleConf.GetOption('main', 'General', 'use-ttk', type='int'):
- from ttk import *
+ from ttk import Entry, Frame, Button, Label
try:
from codecs import BOM_UTF8
@@ -96,11 +96,11 @@
# For some reason, the text is not selectable anymore if the
# widget is disabled.
# l2['state'] = DISABLED
- l2.pack(side=TOP, anchor = W, fill=X)
+ l2.pack(side=TOP, anchor=W, fill=X)
l3 = Label(top, text="to your file\n"
"Choose OK to save this file as %s\n"
"Edit your general options to silence this warning" % enc)
- l3.pack(side=TOP, anchor = W)
+ l3.pack(side=TOP, anchor=W)
buttons = Frame(top)
buttons.pack(side=TOP, fill=X)
@@ -566,6 +566,7 @@
self.editwin.update_recent_files_list(filename)
def test():
+ from Tkinter import Tk, Text
root = Tk()
class MyEditWin:
def __init__(self, text):
Modified: sandbox/trunk/ttk-gsoc/src/idlelib/Percolator.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/idlelib/Percolator.py (original)
+++ sandbox/trunk/ttk-gsoc/src/idlelib/Percolator.py Sat Jul 12 17:26:22 2008
@@ -1,5 +1,5 @@
-from WidgetRedirector import WidgetRedirector
from Delegator import Delegator
+from WidgetRedirector import WidgetRedirector
class Percolator:
@@ -81,5 +81,5 @@
root.mainloop()
if __name__ == "__main__":
- from Tkinter import *
+ from Tkinter import Tk, Text
main()
Modified: sandbox/trunk/ttk-gsoc/src/idlelib/PyShell.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/idlelib/PyShell.py (original)
+++ sandbox/trunk/ttk-gsoc/src/idlelib/PyShell.py Sat Jul 12 17:26:22 2008
@@ -1,29 +1,25 @@
#! /usr/bin/env python
-
import os
-import os.path
+import re
import sys
+import time
+import types
import string
import getopt
-import re
import socket
-import time
-import threading
-import traceback
-import types
-import macosxSupport
-
import linecache
+import threading
from code import InteractiveInterpreter
try:
- from Tkinter import *
+ from Tkinter import Tk, TclError
+ from Tkconstants import END
except ImportError:
print>>sys.__stderr__, "** IDLE can't import Tkinter. " \
"Your Python may not be configured for Tk. **"
sys.exit(1)
try:
- from ttk import *
+ from ttk import Style
TTK = 1
except ImportError:
print >> sys.stderr, "** IDLE can't import ttk."
@@ -31,22 +27,22 @@
import tkMessageBox
+import macosxSupport
from configHandler import idleConf
# store ttk availability
idleConf.SetOption('main', 'General', 'use-ttk', str(TTK))
idleConf.SaveUserCfgFiles()
-from EditorWindow import EditorWindow, fixwordbreaks
-from FileList import FileList
-from ColorDelegator import ColorDelegator
-from UndoDelegator import UndoDelegator
-from OutputWindow import OutputWindow
-import idlever
-
import rpc
+import idlever
import Debugger
import RemoteDebugger
+from FileList import FileList
+from OutputWindow import OutputWindow
+from EditorWindow import EditorWindow, fixwordbreaks
+from UndoDelegator import UndoDelegator
+from ColorDelegator import ColorDelegator
IDENTCHARS = string.ascii_letters + string.digits + "_"
LOCALHOST = '127.0.0.1'
More information about the Python-checkins
mailing list