rearranged some imports

diff --git a/Mac/Tools/IDE/Wbase.py b/Mac/Tools/IDE/Wbase.py
index 764c131c278b2c239d84376047f49e80d3dec2a4..be75d8a2f218d2632805f81dc04cd95f311f1b98 100644 (file)
--- a/Mac/Tools/IDE/Wbase.py
+++ b/Mac/Tools/IDE/Wbase.py
@@ -1,15 +1,13 @@
-from Carbon import Qd
-from Carbon import Win
-from Carbon import QuickDraw
-from Carbon import Evt
+from Carbon import Evt, Qd, QuickDraw, Win
 import string
 from types import *
 import sys
 
-WidgetsError = "WidgetsError"
+class WidgetsError(Exception): pass
 
 DEBUG = 0
 
+
 class Widget:
        
        """Base class for all widgets."""

diff --git a/Mac/Tools/IDE/Wlists.py b/Mac/Tools/IDE/Wlists.py
index 04266f7c5d1146bb59453c558bf386e30ab92483..e7a35015fccbb01ccf0ba27d04a1309b0e4dca31 100644 (file)
--- a/Mac/Tools/IDE/Wlists.py
+++ b/Mac/Tools/IDE/Wlists.py
@@ -1,12 +1,7 @@
 import Wbase
 import Wkeys
-from Carbon import Scrap
 import string
-from Carbon import Evt
-from Carbon import Events
-from Carbon import Qd
-from Carbon import Win
-from Carbon import Lists
+from Carbon import Evt, Events, Lists, Qd, Scrap, Win
 
 
 class List(Wbase.SelectableWidget):

diff --git a/Mac/Tools/IDE/Wmenus.py b/Mac/Tools/IDE/Wmenus.py
index 9af50a7d6be8d1435bfd57a45e40796a7be2d78c..4d65e904d420ab2227d726045a9078b971607670 100644 (file)
--- a/Mac/Tools/IDE/Wmenus.py
+++ b/Mac/Tools/IDE/Wmenus.py
@@ -1,7 +1,6 @@
 import FrameWork
-from Carbon import Qd
 import Wbase, Wcontrols
-from Carbon import Ctl, Controls
+from Carbon import Ctl, Controls, Qd
 from types import *
 import Wapplication
 

diff --git a/Mac/Tools/IDE/Wwindows.py b/Mac/Tools/IDE/Wwindows.py
index 3073b4fadf624164cfc4a732601882337a1f1a3f..1494187bca89884b52015d1e56e501e109cb886f 100644 (file)
--- a/Mac/Tools/IDE/Wwindows.py
+++ b/Mac/Tools/IDE/Wwindows.py
@@ -1,18 +1,11 @@
-from Carbon import Qd
-from Carbon import Win
-from Carbon import Evt
-from Carbon import Fm
+from Carbon import Dlg, Evt, Events, Fm
+from Carbon import Menu, Qd, Win, Windows
 import FrameWork
-from Carbon import Windows
-from Carbon import Events
 import Wbase
-from Carbon import Dlg
 import MacOS
-from Carbon import Menu
 import struct
 import traceback
-
-from types import *
+from types import InstanceType, StringType
 
 
 class Window(FrameWork.Window, Wbase.SelectableWidget):