Import the MacOS toolbox modules from the Carbon package.
diff --git a/Mac/Contrib/BBPy/PythonSlave.py b/Mac/Contrib/BBPy/PythonSlave.py
index 3014f7a..08baf7e 100644
--- a/Mac/Contrib/BBPy/PythonSlave.py
+++ b/Mac/Contrib/BBPy/PythonSlave.py
@@ -14,14 +14,14 @@
import traceback
import aetools
import string
-import AE
-import EasyDialogs
+from Carbon import AE
+from Carbon import EasyDialogs
import os
-import Qd
+from Carbon import Qd
from Types import *
-from Events import charCodeMask, cmdKey
+from Carbon.Events import charCodeMask, cmdKey
import MacOS
-import Evt
+from Carbon import Evt
def dummyfunc(): pass
diff --git a/Mac/Contrib/ImageHelpers/ImageMac.py b/Mac/Contrib/ImageHelpers/ImageMac.py
index 3e46532..44a38c5 100644
--- a/Mac/Contrib/ImageHelpers/ImageMac.py
+++ b/Mac/Contrib/ImageHelpers/ImageMac.py
@@ -21,7 +21,7 @@
'''
import W
-import Qd
+from Carbon import Qd
from ExtPixMapWrapper import *
from Numeric import *
import Image
diff --git a/Mac/Contrib/ImageHelpers/MovieUtils.py b/Mac/Contrib/ImageHelpers/MovieUtils.py
index 7c9130f..8250a82 100644
--- a/Mac/Contrib/ImageHelpers/MovieUtils.py
+++ b/Mac/Contrib/ImageHelpers/MovieUtils.py
@@ -1,10 +1,10 @@
-import Qt
-import QuickTime
+from Carbon import Qt
+from Carbon import QuickTime
import macfs
-import Qd
-from QuickDraw import srcCopy
+from Carbon import Qd
+from Carbon.QuickDraw import srcCopy
from ExtPixMapWrapper import ExtPixMapWrapper
-from Qdoffs import *
+from Carbon.Qdoffs import *
import ImageMac
import W
diff --git a/Mac/Contrib/PythonScript/PythonScript.py b/Mac/Contrib/PythonScript/PythonScript.py
index b6077ae..731db98 100644
--- a/Mac/Contrib/PythonScript/PythonScript.py
+++ b/Mac/Contrib/PythonScript/PythonScript.py
@@ -10,7 +10,7 @@
import getaete
import baetools
import baetypes
-import AE
+from Carbon import AE
import AppleEvents
import macfs
from types import *
diff --git a/Mac/Contrib/PythonScript/baepack.py b/Mac/Contrib/PythonScript/baepack.py
index 26267ac..39e064b 100644
--- a/Mac/Contrib/PythonScript/baepack.py
+++ b/Mac/Contrib/PythonScript/baepack.py
@@ -17,8 +17,8 @@
import types
from string import strip
from types import *
-import AE
-from AppleEvents import *
+from Carbon import AE
+from Carbon.AppleEvents import *
import MacOS
import macfs
import StringIO
@@ -195,7 +195,7 @@
v = 0x100000000L + v
return v
if t == typeObjectSpecifier:
- import Res
+ from Carbon import Res
# print desc, type(desc)
# print desc.__members__
# print desc.data, desc.type
diff --git a/Mac/Contrib/PythonScript/baetools.py b/Mac/Contrib/PythonScript/baetools.py
index 8f0bb04..acc00a6 100644
--- a/Mac/Contrib/PythonScript/baetools.py
+++ b/Mac/Contrib/PythonScript/baetools.py
@@ -21,8 +21,8 @@
"""
from types import *
-import AE
-import AppleEvents
+from Carbon import AE
+from Carbon import AppleEvents
import MacOS
import sys
diff --git a/Mac/Contrib/PythonScript/baetypes.py b/Mac/Contrib/PythonScript/baetypes.py
index 1d8266d..9b50e78 100644
--- a/Mac/Contrib/PythonScript/baetypes.py
+++ b/Mac/Contrib/PythonScript/baetypes.py
@@ -1,6 +1,6 @@
"""aetypes - Python objects representing various AE types."""
-from AppleEvents import *
+from Carbon.AppleEvents import *
import struct
from types import *
import string
diff --git a/Mac/Contrib/PythonScript/getaete.py b/Mac/Contrib/PythonScript/getaete.py
index 14beb32..ba22c9d 100644
--- a/Mac/Contrib/PythonScript/getaete.py
+++ b/Mac/Contrib/PythonScript/getaete.py
@@ -18,7 +18,7 @@
from MACFS import *
import macfs
import string
-from Res import *
+from Carbon.Res import *
import struct
# for testing only
diff --git a/Mac/Contrib/PythonScript/printaete.py b/Mac/Contrib/PythonScript/printaete.py
index a7fe8e0..b105d8a 100644
--- a/Mac/Contrib/PythonScript/printaete.py
+++ b/Mac/Contrib/PythonScript/printaete.py
@@ -14,7 +14,7 @@
import macfs
import string
import macpath
-from Res import *
+from Carbon.Res import *
# for testing only
app = 'MACS'#CSOm'#'nwSP'#'ezVu'#