12 files changed, 38 insertions, 38 deletions
diff --git a/Mac/Lib/test/AEservertest.py b/Mac/Lib/test/AEservertest.py
index 631889d..d474f43 100644
--- a/Mac/Lib/test/AEservertest.py
+++ b/Mac/Lib/test/AEservertest.py
@@ -10,15 +10,15 @@ import sys
 sys.stdout = sys.stderr
 import traceback
 import MacOS
-import AE
-from AppleEvents import *
-import Evt
-from Events import *
-import Menu
-import Dlg
-import Win
-from Windows import *
-import Qd
+from Carbon import AE
+from Carbon.AppleEvents import *
+from Carbon import Evt
+from Carbon.Events import *
+from Carbon import Menu
+from Carbon import Dlg
+from Carbon import Win
+from Carbon.Windows import *
+from Carbon import Qd
 import macfs
 
 import aetools
diff --git a/Mac/Lib/test/aete.py b/Mac/Lib/test/aete.py
index 21fff61..3945a86 100644
--- a/Mac/Lib/test/aete.py
+++ b/Mac/Lib/test/aete.py
@@ -8,7 +8,7 @@ import sys
 import types
 import StringIO
 
-from Res import *
+from Carbon.Res import *
 
 def main():
 	filename = ""
diff --git a/Mac/Lib/test/cmtest.py b/Mac/Lib/test/cmtest.py
index 7170424..bdbca23 100644
--- a/Mac/Lib/test/cmtest.py
+++ b/Mac/Lib/test/cmtest.py
@@ -1,8 +1,8 @@
 """cmtest - List all components in the system"""
 
-import Cm
-import Res
-import sys
+from Carbon import Cm
+from Carbon import Res
+from Carbon import sys
 
 def getstr255(r):
 	"""Get string from str255 resource"""
diff --git a/Mac/Lib/test/ctbtest.py b/Mac/Lib/test/ctbtest.py
index cb1b506..91824d3 100644
--- a/Mac/Lib/test/ctbtest.py
+++ b/Mac/Lib/test/ctbtest.py
@@ -3,8 +3,8 @@
 # To simplify matters use the python console window for output.
 #
 import ctb
-import Evt
-import Events
+from Carbon import Evt
+from Carbon import Events
 import MacOS
 import sys
 
diff --git a/Mac/Lib/test/dragtest.py b/Mac/Lib/test/dragtest.py
index 7663af7..28eb1a9 100644
--- a/Mac/Lib/test/dragtest.py
+++ b/Mac/Lib/test/dragtest.py
@@ -1,4 +1,4 @@
-import Drag
+from Carbon import Drag
 import time
 xxxx=1
 def decode_hfs(data):
diff --git a/Mac/Lib/test/echo.py b/Mac/Lib/test/echo.py
index 46c84c2..f84e13b 100644
--- a/Mac/Lib/test/echo.py
+++ b/Mac/Lib/test/echo.py
@@ -10,15 +10,15 @@ import sys
 sys.stdout = sys.stderr
 import traceback
 import MacOS
-import AE
-from AppleEvents import *
-import Evt
-from Events import *
-import Menu
-import Dlg
-import Win
-from Windows import *
-import Qd
+from Carbon import AE
+from Carbon.AppleEvents import *
+from Carbon import Evt
+from Carbon.Events import *
+from Carbon import Menu
+from Carbon import Dlg
+from Carbon import Win
+from Carbon.Windows import *
+from Carbon import Qd
 
 import aetools
 import EasyDialogs
diff --git a/Mac/Lib/test/icgluetest.py b/Mac/Lib/test/icgluetest.py
index 97c0c74..dd34bd0 100644
--- a/Mac/Lib/test/icgluetest.py
+++ b/Mac/Lib/test/icgluetest.py
@@ -2,7 +2,7 @@
 not the icglue module, is what you should normally use."""
 
 import icglue
-import Res
+from Carbon import Res
 
 ici = icglue.ICStart('Pyth')
 #ici.ICFindConfigFile()
diff --git a/Mac/Lib/test/tell.py b/Mac/Lib/test/tell.py
index 74e0ca0..fcacb7e 100644
--- a/Mac/Lib/test/tell.py
+++ b/Mac/Lib/test/tell.py
@@ -1,8 +1,8 @@
 # (Slightly less) primitive operations for sending Apple Events to applications.
 # This could be the basis of a Script Editor like application.
 
-from AE import *
-from AppleEvents import *
+from Carbon.AE import *
+from Carbon.AppleEvents import *
 import aetools
 import types
 
diff --git a/Mac/Lib/test/test_setcontroldata.py b/Mac/Lib/test/test_setcontroldata.py
index c46e613..8167214 100644
--- a/Mac/Lib/test/test_setcontroldata.py
+++ b/Mac/Lib/test/test_setcontroldata.py
@@ -1,5 +1,5 @@
 import W
-from Controls import *
+from Carbon.Controls import *
 
 w = W.Window((200,200), "Test")
 
diff --git a/Mac/Lib/test/tlist.py b/Mac/Lib/test/tlist.py
index fdcfe6e..5b84fc5 100644
--- a/Mac/Lib/test/tlist.py
+++ b/Mac/Lib/test/tlist.py
@@ -8,10 +8,10 @@
 # Actually, it is more a test of FrameWork by now....
 
 from FrameWork import *
-import Win
-import Qd
-import List
-import Lists
+from Carbon import Win
+from Carbon import Qd
+from Carbon import List
+from Carbon import Lists
 import os
 
 class ListWindow(Window):
diff --git a/Mac/Lib/test/tsnd.py b/Mac/Lib/test/tsnd.py
index ac347cb..919785a 100644
--- a/Mac/Lib/test/tsnd.py
+++ b/Mac/Lib/test/tsnd.py
@@ -1,8 +1,8 @@
 # Show off SndPlay (and some resource manager functions).
 # Get a list of all 'snd ' resources in the system and play them all.
 
-from Res import *
-from Snd import *
+from Carbon.Res import *
+from Carbon.Snd import *
 
 ch = SndNewChannel(0, 0, None)
 print "Channel:", ch
diff --git a/Mac/Lib/test/tte.py b/Mac/Lib/test/tte.py
index 9e6bee4..bde7de2 100644
--- a/Mac/Lib/test/tte.py
+++ b/Mac/Lib/test/tte.py
@@ -1,8 +1,8 @@
 # Test TE module, simple version
 
-from Win import *
-from TE import *
-import Qd
+from Carbon.Win import *
+from Carbon.TE import *
+from Carbon import Qd
 
 r = (40, 40, 140, 140)
 w = NewWindow(r, "TETextBox test", 1, 0, -1, 1, 0x55555555)