[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE Wlists.py,1.5,1.6 Wmenus.py,1.5,1.6 Wwindows.py,1.12,1.13 Wbase.py,1.6,1.7

[Just van Rossum]

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory usw-pr-cvs1:/tmp/cvs-serv32017

Modified Files:
	Wlists.py Wmenus.py Wwindows.py Wbase.py 
Log Message:
rearranged some imports

Index: Wlists.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wlists.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Wlists.py	2001/08/25 12:14:13	1.5
--- Wlists.py	2001/11/02 19:09:34	1.6
***************
*** 1,11 ****
  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
  
  
--- 1,6 ----
  import Wbase
  import Wkeys
  import string
! from Carbon import Evt, Events, Lists, Qd, Scrap, Win
  
  

Index: Wmenus.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wmenus.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Wmenus.py	2001/08/25 12:14:22	1.5
--- Wmenus.py	2001/11/02 19:09:34	1.6
***************
*** 1,6 ****
  import FrameWork
- from Carbon import Qd
  import Wbase, Wcontrols
! from Carbon import Ctl, Controls
  from types import *
  import Wapplication
--- 1,5 ----
  import FrameWork
  import Wbase, Wcontrols
! from Carbon import Ctl, Controls, Qd
  from types import *
  import Wapplication

Index: Wwindows.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wwindows.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Wwindows.py	2001/08/27 10:54:55	1.12
--- Wwindows.py	2001/11/02 19:09:34	1.13
***************
*** 1,17 ****
! from Carbon import Qd
! from Carbon import Win
! from Carbon import Evt
! from Carbon import Fm
  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 *
  
  
--- 1,10 ----
! from Carbon import Dlg, Evt, Events, Fm
! from Carbon import Menu, Qd, Win, Windows
  import FrameWork
  import Wbase
  import MacOS
  import struct
  import traceback
! from types import InstanceType, StringType
  
  

Index: Wbase.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wbase.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Wbase.py	2001/10/31 12:55:07	1.6
--- Wbase.py	2001/11/02 19:09:34	1.7
***************
*** 1,13 ****
! from Carbon import Qd
! from Carbon import Win
! from Carbon import QuickDraw
! from Carbon import Evt
  import string
  from types import *
  import sys
  
! WidgetsError = "WidgetsError"
  
  DEBUG = 0
  
  class Widget:
--- 1,11 ----
! from Carbon import Evt, Qd, QuickDraw, Win
  import string
  from types import *
  import sys
  
! class WidgetsError(Exception): pass
  
  DEBUG = 0
+ 
  
  class Widget: