Import the MacOS toolbox modules from the Carbon package.

diff --git a/Mac/Contrib/BBPy/PythonSlave.py b/Mac/Contrib/BBPy/PythonSlave.py
index 3014f7a196813f3cd8ea3e4a10005610d0cae5be..08baf7e2294d56f6e2634b9fc1dcff08dcb36d3c 100644 (file)
--- a/Mac/Contrib/BBPy/PythonSlave.py
+++ b/Mac/Contrib/BBPy/PythonSlave.py
@@ -14,14 +14,14 @@ import sys
 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 3e465325c3f3986fc5ccad988f9c8ea49553d8a5..44a38c55c4d5f16dd5812bb2ac77414a1aae2422 100644 (file)
--- a/Mac/Contrib/ImageHelpers/ImageMac.py
+++ b/Mac/Contrib/ImageHelpers/ImageMac.py
@@ -21,7 +21,7 @@ Being one of my first experiences with Python I didn't use Exceptions to signal
 
 '''
 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 7c9130f1c4136ab482ef210facb4c63097b1d711..8250a82cbbea8a065d6c781ee28f15eb53955fec 100644 (file)
--- 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 b6077aea1119b02ef4ffec2f7dd5ffbc6beb8478..731db985eec0e505597153240903bd3667f39b7d 100644 (file)
--- a/Mac/Contrib/PythonScript/PythonScript.py
+++ b/Mac/Contrib/PythonScript/PythonScript.py
@@ -10,7 +10,7 @@ import sys
 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 26267acdf577ac67948ee885f0b81e4233e6b9ba..39e064b151db4630b1f081be70252f278bf6e17e 100644 (file)
--- a/Mac/Contrib/PythonScript/baepack.py
+++ b/Mac/Contrib/PythonScript/baepack.py
@@ -17,8 +17,8 @@ import string
 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 @@ def unpack(desc):
                        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 8f0bb0486dd0c83a23a3b29756242a3335be7e2f..acc00a6bd2e2618b2901651510280719dfb220cf 100644 (file)
--- a/Mac/Contrib/PythonScript/baetools.py
+++ b/Mac/Contrib/PythonScript/baetools.py
@@ -21,8 +21,8 @@ files: the pack stuff from aepack, the objects from aetypes.
 """
 
 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 1d8266d42860b398739ec553d136d985ece48293..9b50e78d01befcab8279a9836a8356c27afcaf71 100644 (file)
--- 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 14beb323cc38f3a13313743f9c61184324743f3a..ba22c9dc34d9dc496f6118da14f8ba466c6a096f 100644 (file)
--- a/Mac/Contrib/PythonScript/getaete.py
+++ b/Mac/Contrib/PythonScript/getaete.py
@@ -18,7 +18,7 @@ import types
 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 a7fe8e0d02f7d3ae98aa1909e95ed033ad22d740..b105d8ae3e783d177c77959e9c225f9cd8014222 100644 (file)
--- a/Mac/Contrib/PythonScript/printaete.py
+++ b/Mac/Contrib/PythonScript/printaete.py
@@ -14,7 +14,7 @@ import types
 import macfs
 import string
 import macpath
-from Res import *
+from Carbon.Res import *
 
 # for testing only
 app = 'MACS'#CSOm'#'nwSP'#'ezVu'#

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index 865ff9e7012af746d8458a410011c546f301452d..162fcb6bcc49ea83967ac23d914440ea3b06638f 100644 (file)
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -2,14 +2,14 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
-import Icn
+from Carbon import Icn
 
 #
 # Resource definitions

diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index da32b50ec09e640ebceb80d638288711f3bb5de9..e45b18c9d85137bc506f424b77e70ec3034015e0 100644 (file)
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
 

diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 56440f20a25c024e01b2f16ed8f581ce12db9739..7e146edf9e16ddc62da79c0cb0dabcbf3c57ab8f 100644 (file)
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
 

diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index 47cd472bef4de42ba4b89eece740e9c2b2f846b5..89f82184df69d5e34687270859b3de5ce3dbfdf9 100644 (file)
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -2,14 +2,14 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
-import Icn
+from Carbon import Icn
 
 #
 # Resource definitions

diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.py b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
index 0012958c16b27b51927ae30990e99dfaeff793e9..01cf71c458dd663189a59ffd3dda738fb9699549 100644 (file)
--- a/Mac/Demo/PICTbrowse/oldPICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
@@ -2,10 +2,10 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import List
 import sys
 import struct
 

diff --git a/Mac/Demo/calldll/testcalldll.py b/Mac/Demo/calldll/testcalldll.py
index ef176d83fc731a37450f105414b4627057f74738..cdb24c3d4fa33d819c302ce17a0a41a8a4744422 100644 (file)
--- a/Mac/Demo/calldll/testcalldll.py
+++ b/Mac/Demo/calldll/testcalldll.py
@@ -2,7 +2,7 @@ import calldll
 import macfs
 import sys
 import MacOS
-import Res
+from Carbon import Res
 
 fss, ok = macfs.PromptGetFile("Show me calldll.ppc.slb")
 

diff --git a/Mac/Demo/example1/dnslookup-1.py b/Mac/Demo/example1/dnslookup-1.py
index 294faad3630c672323b149e53c5d07259616a002..9a2ab286f1aa2048e652f11b0007aad2bd952a25 100644 (file)
--- a/Mac/Demo/example1/dnslookup-1.py
+++ b/Mac/Demo/example1/dnslookup-1.py
@@ -2,8 +2,8 @@
 Res and Dlg in the process"""
 
 import EasyDialogs
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 import sys
 import socket
 import string

diff --git a/Mac/Demo/example2/dnslookup-2.py b/Mac/Demo/example2/dnslookup-2.py
index e595b8e2da78b677ede3a247d48764d881092d24..20e7fa582d989910e7c2231080ae872b60fd948a 100644 (file)
--- a/Mac/Demo/example2/dnslookup-2.py
+++ b/Mac/Demo/example2/dnslookup-2.py
@@ -1,7 +1,7 @@
 import FrameWork
 import EasyDialogs
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 import sys
 import socket
 import string

diff --git a/Mac/Demo/imgbrowse/imgbrowse.py b/Mac/Demo/imgbrowse/imgbrowse.py
index ab9b429054c3cb0e2a61c253af49df177b3ebcfd..c67f4e8085fa1c67f9895b0dda32267c1e3c13f7 100644 (file)
--- a/Mac/Demo/imgbrowse/imgbrowse.py
+++ b/Mac/Demo/imgbrowse/imgbrowse.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import QuickDraw
-import Win
-#import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Win
+#ifrom Carbon mport List
 import sys
 import struct
 import img

diff --git a/Mac/Demo/imgbrowse/mac_image.py b/Mac/Demo/imgbrowse/mac_image.py
index 4e3881f9f46716adc9b8046b6affb51b3ffa73ca..094c58e164cf2b789ab61ad003375435f8160c74 100644 (file)
--- a/Mac/Demo/imgbrowse/mac_image.py
+++ b/Mac/Demo/imgbrowse/mac_image.py
@@ -1,6 +1,6 @@
 """mac_image - Helper routines (hacks) for images"""
 import imgformat
-import Qd
+from Carbon import Qd
 import time
 import struct
 import MacOS

diff --git a/Mac/Demo/mlte/mlted.py b/Mac/Demo/mlte/mlted.py
index 10d56989fdb3ce8c1b44690cbbeaf3fde91bee7a..2ae77e78623bd10894d6f677bb60b89ec4057c5e 100644 (file)
--- a/Mac/Demo/mlte/mlted.py
+++ b/Mac/Demo/mlte/mlted.py
@@ -5,15 +5,15 @@
 
 from Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Ctl
-import Qd
-import Res
-import Scrap
+from Carbon import Win
+from Carbon import Ctl
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Scrap
 import os
 import macfs
-import MacTextEditor
-import Mlte
+from Carbon import MacTextEditor
+from Carbon import Mlte
 
 UNDOLABELS = [ # Indexed by MLTECanUndo() value
        "Typing", "Cut", "Paste", "Clear", "Font Change", "Color Change", "Size Change",

diff --git a/Mac/Demo/printing/PrintingDemo.py b/Mac/Demo/printing/PrintingDemo.py
index 6f7881f4b9b717ef4919b0604201677cb76f44b7..a42ac2f4aba71ab5941e79ca982052c93f22fb30 100644 (file)
--- a/Mac/Demo/printing/PrintingDemo.py
+++ b/Mac/Demo/printing/PrintingDemo.py
@@ -1,7 +1,7 @@
 import Printing
-import Qd
-import Fm
-import Res
+from Carbon import Qd
+from Carbon import Fm
+from Carbon import Res
 
 # some constants
 PostScriptBegin = 190  # Set driver state to PostScript        

diff --git a/Mac/Demo/quicktime/MovieInWindow.py b/Mac/Demo/quicktime/MovieInWindow.py
index af9c7d7d88a9f7b8b4797c23ecf85a6918163d52..9cd4e772b067f831ecde16df8abf6283d57fcc8a 100644 (file)
--- a/Mac/Demo/quicktime/MovieInWindow.py
+++ b/Mac/Demo/quicktime/MovieInWindow.py
@@ -3,14 +3,14 @@
 Jack Jansen, CWI, December 1995
 """
 
-import Qt
-import QuickTime
-import Qd
-import QuickDraw
-import Evt
-import Events
-import Win
-import Windows
+from Carbon import Qt
+from Carbon import QuickTime
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Win
+from Carbon import Windows
 import macfs
 import sys
 

diff --git a/Mac/Demo/quicktime/VerySimplePlayer.py b/Mac/Demo/quicktime/VerySimplePlayer.py
index 3053d33a03a7fa4968b4f800a5b7bbb738f96f6f..4962ebb854f0df14e76e555260899c3eeb8ef9ad 100644 (file)
--- a/Mac/Demo/quicktime/VerySimplePlayer.py
+++ b/Mac/Demo/quicktime/VerySimplePlayer.py
@@ -3,14 +3,14 @@
 Jack Jansen, CWI, December 1995
 """
 
-import Qt
-import QuickTime
-import Qd
-import QuickDraw
-import Evt
-import Events
-import Win
-import Windows
+from Carbon import Qt
+from Carbon import QuickTime
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Win
+from Carbon import Windows
 import macfs
 import sys
 

diff --git a/Mac/Demo/resources/copyres.py b/Mac/Demo/resources/copyres.py
index b401142550453e58af99d49fb9774c6c42900d99..ae627efb07e2455cd13389f920bffad5c1b37903 100644 (file)
--- a/Mac/Demo/resources/copyres.py
+++ b/Mac/Demo/resources/copyres.py
@@ -1,5 +1,5 @@
-from Res import *
-from Resources import *
+from Carbon.Res import *
+from Carbon.Resources import *
 import MacOS
 
 READ = 1

diff --git a/Mac/Demo/resources/listres.py b/Mac/Demo/resources/listres.py
index a0b24237eedf37274d9bdfabb69df04d9f89a3f3..7575db803e1a4b8a3389c0604d5f8389b4bb0980 100644 (file)
--- a/Mac/Demo/resources/listres.py
+++ b/Mac/Demo/resources/listres.py
@@ -1,7 +1,7 @@
 # List all resources
 
-import Res
-from Resources import *
+from Carbon import Res
+from Carbon.Resources import *
 
 def list1resources():
        ntypes = Res.Count1Types()

diff --git a/Mac/Demo/sound/playaiff.py b/Mac/Demo/sound/playaiff.py
index 1022fc8a74a6e390ad9e6f6d22ba935b388bc574..8237895250b31da5e46daf651950de9c966f6df9 100644 (file)
--- a/Mac/Demo/sound/playaiff.py
+++ b/Mac/Demo/sound/playaiff.py
@@ -1,5 +1,5 @@
-from Sound import *
-import Snd
+from Carbon.Sound import *
+from Carbon import Snd
 
 import aifc, audioop
 

diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
index 529ac12240682cf5474a6499ee55a82eabab87c7..524b92ad328d611af65615d283f5bdb5da9e5234 100644 (file)
--- a/Mac/Demo/textedit/ped.py
+++ b/Mac/Demo/textedit/ped.py
@@ -5,12 +5,12 @@
 # - Handle horizontal scrollbar correctly
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import TE
-import Scrap
+from Carbon import Win
+from Carbon import Qd
+from Carbon import TE
+from Carbon import Scrap
 import os
 import macfs
 

diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index 4d29e1ea9b839a2d9288700ba16f337416046743..fc2ce5b437ddc4a88d9a743e59fc34b1e6a380a7 100644 (file)
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -3,15 +3,15 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
-import Fm
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Fm
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs
 import MACFS

diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index e4622da2c2f378f2f8a40fe5fc690d34f404f042..e2c266657bd1584af27a31f9790f4455d7d83916 100644 (file)
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -3,15 +3,15 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
-import Fm
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Fm
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs
 import MACFS

diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 342d52e27868b32dcb40762cb8b54b002b980268..00ff8d8d762fd5ea4002e9d4217ed0ca921dfbe5 100644 (file)
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -3,14 +3,14 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs
 

diff --git a/Mac/IDE scripts/Widget demos/ModalDialog.py b/Mac/IDE scripts/Widget demos/ModalDialog.py
index 683a76aaa9a77f3a397328b8f5b9da228f98fcf9..801dfd4eb0642ed6d9144c7637d1949b0ab66bc0 100644 (file)
--- a/Mac/IDE scripts/Widget demos/ModalDialog.py
+++ b/Mac/IDE scripts/Widget demos/ModalDialog.py
@@ -1,5 +1,5 @@
 import W
-import Windows
+from Carbon import Windows
 
 
 w = W.ModalDialog((100, 100))

diff --git a/Mac/Lib/Audio_mac.py b/Mac/Lib/Audio_mac.py
index 14f825e0ecc6ab75e9a9859c63312caaff32a9f3..d8b327bd12cb828bc56467bedc25e1de068ebe52 100644 (file)
--- a/Mac/Lib/Audio_mac.py
+++ b/Mac/Lib/Audio_mac.py
@@ -40,11 +40,11 @@ class Play_Audio_mac:
 
        def writeframes(self, data):
                import time
-               from Sound import bufferCmd, callBackCmd, extSH
+               from Carbon.Sound import bufferCmd, callBackCmd, extSH
                import struct
                import MacOS
                if not self._chan:
-                       import Snd
+                       from Carbon import Snd
                        self._chan = Snd.SndNewChannel(5, 0, self._callback)
                nframes = len(data) / self._nchannels / self._sampwidth
                if len(data) != nframes * self._nchannels * self._sampwidth:

diff --git a/Mac/Lib/EasyDialogs.py b/Mac/Lib/EasyDialogs.py
index 19439089105aadd80c53715a4a96b1c253ceb4be..68ad58eb350d38f9fce7a1512ad230d0bc698e4b 100644 (file)
--- a/Mac/Lib/EasyDialogs.py
+++ b/Mac/Lib/EasyDialogs.py
@@ -14,18 +14,18 @@ This module uses DLOG resources 260 and on.
 Based upon STDWIN dialogs with the same names and functions.
 """
 
-from Dlg import GetNewDialog, SetDialogItemText, GetDialogItemText, ModalDialog
-import Qd
-import QuickDraw
-import Dialogs
-import Windows
-import Dlg,Win,Evt,Events # sdm7g
-import Ctl
-import Controls
-import Menu
+from Carbon.Dlg import GetNewDialog, SetDialogItemText, GetDialogItemText, ModalDialog
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Dialogs
+from Carbon import Windows
+from Carbon import Dlg,Win,Evt,Events # sdm7g
+from Carbon import Ctl
+from Carbon import Controls
+from Carbon import Menu
 import MacOS
 import string
-from ControlAccessor import *  # Also import Controls constants
+from Carbon.ControlAccessor import *   # Also import Controls constants
 import macfs
 
 def cr2lf(text):

diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py
index 3ee118da2e06241fcb45435e3e93d2a3c2cc65c5..b2b61dbca803e5e41a36c17bab143a557f987c74 100644 (file)
--- a/Mac/Lib/FrameWork.py
+++ b/Mac/Lib/FrameWork.py
@@ -5,24 +5,24 @@ DEBUG=0
 import MacOS
 import traceback
 
-from AE import *
-from AppleEvents import *
-from Ctl import *
-from Controls import *
-from Dlg import *
-from Dialogs import *
-from Evt import *
-from Events import *
-from Menu import *
-from Menus import *
-from Qd import *
-from QuickDraw import *
-#from Res import *
-#from Resources import *
-#from Snd import *
-#from Sound import *
-from Win import *
-from Windows import *
+from Carbon.AE import *
+from Carbon.AppleEvents import *
+from Carbon.Ctl import *
+from Carbon.Controls import *
+from Carbon.Dlg import *
+from Carbon.Dialogs import *
+from Carbon.Evt import *
+from Carbon.Events import *
+from Carbon.Menu import *
+from Carbon.Menus import *
+from Carbon.Qd import *
+from Carbon.QuickDraw import *
+#from Carbon.Res import *
+#from Carbon.Resources import *
+#from Carbon.Snd import *
+#from Carbon.Sound import *
+from Carbon.Win import *
+from Carbon.Windows import *
 import types
 
 import EasyDialogs

diff --git a/Mac/Lib/MiniAEFrame.py b/Mac/Lib/MiniAEFrame.py
index fbb6f1b7b76ad4e9cb5811d87e1c7b04be90c9a7..e5623016217fad48855df42e4c6d414b14cff1af 100644 (file)
--- a/Mac/Lib/MiniAEFrame.py
+++ b/Mac/Lib/MiniAEFrame.py
@@ -9,14 +9,14 @@ There are two classes:
 import sys
 import traceback
 import MacOS
-import AE
-from AppleEvents import *
-import Evt
-from Events import *
-import Menu
-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 Win
+from Carbon.Windows import *
+from Carbon import Qd
 
 import aetools
 import EasyDialogs

diff --git a/Mac/Lib/PixMapWrapper.py b/Mac/Lib/PixMapWrapper.py
index 72a64ba0b9d722078d26479520b9a209940a2c59..b167cc2688309655a43da9221f7ff783f955f199 100644 (file)
--- a/Mac/Lib/PixMapWrapper.py
+++ b/Mac/Lib/PixMapWrapper.py
@@ -5,8 +5,8 @@ Python Imaging Library Image object.
 
 J. Strout <joe@strout.net>  February 1999"""
 
-import Qd
-import QuickDraw
+from Carbon import Qd
+from Carbon import QuickDraw
 import struct
 import MacOS
 import img

diff --git a/Mac/Lib/aepack.py b/Mac/Lib/aepack.py
index be6e645ff43707658ce2b8e79110f8e58a9ec00b..161f3eb343a22a0713686a0285a0caf1b919bca1 100644 (file)
--- a/Mac/Lib/aepack.py
+++ b/Mac/Lib/aepack.py
@@ -17,8 +17,8 @@ import string
 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

diff --git a/Mac/Lib/aetools.py b/Mac/Lib/aetools.py
index 1af761e2d89f7b1fe75e2022fe8e71d1acd9e003..00ec18aadc7a441f3391c1cb12f1cc0100c4c74a 100644 (file)
--- a/Mac/Lib/aetools.py
+++ b/Mac/Lib/aetools.py
@@ -22,8 +22,8 @@ files: the pack stuff from aepack, the objects from aetypes.
 
 
 from types import *
-import AE
-import AppleEvents
+from Carbon import AE
+from Carbon import AppleEvents
 import MacOS
 import sys
 

diff --git a/Mac/Lib/aetypes.py b/Mac/Lib/aetypes.py
index 253d1e748746bc8772c72a07442e4b12a2812edf..8fe8cf9ac13fb8b8754f3e1dc5efd47e154ca298 100644 (file)
--- a/Mac/Lib/aetypes.py
+++ b/Mac/Lib/aetypes.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/Lib/buildtools.py b/Mac/Lib/buildtools.py
index dd2e30e3bfadb6d0410a97aedfae3b3f79364433..da43d096d95b2219e446ff6aa3eb4fa4e3583b00 100644 (file)
--- a/Mac/Lib/buildtools.py
+++ b/Mac/Lib/buildtools.py
@@ -6,7 +6,7 @@ import string
 import imp
 import marshal
 import macfs
-import Res
+from Carbon import Res
 import MACFS
 import MacOS
 import macostools

diff --git a/Mac/Lib/cfmfile.py b/Mac/Lib/cfmfile.py
index 9c449e0cc3f50bb89b17c7117479745b7e267747..9efc409a690de55eef6d9be4e671b590f2bff263 100644 (file)
--- a/Mac/Lib/cfmfile.py
+++ b/Mac/Lib/cfmfile.py
@@ -7,7 +7,7 @@ __author__ = "jvr"
 
 import macfs
 import struct
-import Res
+from Carbon import Res
 import os
 import sys
 

diff --git a/Mac/Lib/findertools.py b/Mac/Lib/findertools.py
index 7e1e3fd648e17f82bdb4842663cb7f8500d1a06e..aeb6b93d4d2b99a9e559331b6b8c8e12fa4db6e3 100644 (file)
--- a/Mac/Lib/findertools.py
+++ b/Mac/Lib/findertools.py
@@ -15,7 +15,7 @@ So bottom line: the processes() stuff does not work on < MacOS9
 Mostly written by erik@letterror.com
 """
 import Finder
-import AppleEvents
+from Carbon import AppleEvents
 import aetools
 import MacOS
 import sys

diff --git a/Mac/Lib/ic.py b/Mac/Lib/ic.py
index 57564633b5456b897a4a8a92bffb59ac3e71388b..abe5b69c598f3520eb3fb3693bdf383d24b106ef 100644 (file)
--- a/Mac/Lib/ic.py
+++ b/Mac/Lib/ic.py
@@ -3,7 +3,7 @@
 import icglue
 import string
 import sys
-import Res
+from Carbon import Res
 import macfs
 import macostools
 

diff --git a/Mac/Lib/macfsn.py b/Mac/Lib/macfsn.py
index 3c126465edefadee2556c1dd3d06cfbe7953c6fa..c4969034af76a308b75ffef16cee237ff4aab02c 100644 (file)
--- a/Mac/Lib/macfsn.py
+++ b/Mac/Lib/macfsn.py
@@ -2,7 +2,7 @@
 API calls with Navigation Services"""
 import macfs
 import struct
-import Res
+from Carbon import Res
 try:
        import Nav
 except ImportError:

diff --git a/Mac/Lib/macostools.py b/Mac/Lib/macostools.py
index d706856181885c537a109ee43ade2d5de1389fe4..ab6ab88585392851f9724faa0389f8bcede8e8ab 100644 (file)
--- a/Mac/Lib/macostools.py
+++ b/Mac/Lib/macostools.py
@@ -5,7 +5,7 @@ copy(src, dst) - Full copy of 'src' to 'dst'
 """
 
 import macfs
-import Res
+from Carbon import Res
 import os
 from MACFS import *
 import MacOS

diff --git a/Mac/Lib/mkcwproject/__init__.py b/Mac/Lib/mkcwproject/__init__.py
index fec4476d479047b9c5ffcf186fdd2096e933619e..da73adb94d536f16b6cdfa4e79920fbfbe35c28a 100644 (file)
--- a/Mac/Lib/mkcwproject/__init__.py
+++ b/Mac/Lib/mkcwproject/__init__.py
@@ -1,7 +1,7 @@
 import cwxmlgen
 import cwtalker
 import os
-import AppleEvents
+from Carbon import AppleEvents
 import macfs
 
 def mkproject(outputfile, modulename, settings, force=0, templatename=None):

diff --git a/Mac/Lib/preferences.py b/Mac/Lib/preferences.py
index b1e094818e1e738dbbe9a947618123aaeba009c1..8b77012788ca7899a06cfcf938be7fbe92741cd1 100644 (file)
--- a/Mac/Lib/preferences.py
+++ b/Mac/Lib/preferences.py
@@ -1,7 +1,7 @@
 #
 # General parser/loaders for preferences files and such
 #
-import Res
+from Carbon import Res
 import macfs
 import struct
 import MACFS

diff --git a/Mac/Lib/py_resource.py b/Mac/Lib/py_resource.py
index 85d67e5f589f257a9863836b8c898aaca9d10b00..0faf1f1ebaed1a361e7a729d415e40d9fce28f0a 100644 (file)
--- a/Mac/Lib/py_resource.py
+++ b/Mac/Lib/py_resource.py
@@ -1,6 +1,6 @@
 """Creation of PYC resources"""
 import os
-import Res
+from Carbon import Res
 import __builtin__
 
 READ = 1

diff --git a/Mac/Lib/test/AEservertest.py b/Mac/Lib/test/AEservertest.py
index 631889d89057c9cf808d3c31806a7699bd9f8667..d474f437224235461c83c9d8220c665027a17792 100644 (file)
--- 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 21fff6189b425f4507933591d33199dd8bc6dba9..3945a86199858706e637044cd82c7ea2eb64a4b3 100644 (file)
--- 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 71704244297241c45067a4d153532f914fdb7090..bdbca23d307266ffea13895724d4aa5b51fa8aab 100644 (file)
--- 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 cb1b5068e0820ac4be43365ca5b62719bf889ea9..91824d35585030881639f61876e10af7cd021f35 100644 (file)
--- 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 7663af703e58173543a5f70a2be07166389e5187..28eb1a963e0fe21d9e4cdfe4596852bda4d9d7cb 100644 (file)
--- 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 46c84c26c2f1d4ccaaa0471e1670c49a88161fe4..f84e13baf44ec2bb373fefcb6749a984e667e498 100644 (file)
--- 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 97c0c74df47e7e083ee543d557c63ab92213358a..dd34bd033bea695a318d0f0db0839a9d30f23d54 100644 (file)
--- 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 74e0ca0fb756a0f6577b61c994281f66c6a15770..fcacb7ed5862675c918ab7737f7db213309d87ee 100644 (file)
--- 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 c46e6134d1c1a524f1ab00d26c102e52afb4f352..81672145ac48a28b2719d342998eedb66e3fbc36 100644 (file)
--- 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 fdcfe6e1c9c1892584aab2b6068a5c9a86e8f66b..5b84fc5164a9be3b71a6db1c285dd8bb23e14182 100644 (file)
--- 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 ac347cb64087688cbca4c6597259862b2fb029db..919785a3066a6eb550612f2f4cced026201007d6 100644 (file)
--- 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 9e6bee4471d50395237223573c8be5153348074d..bde7de247ac66ddbceca220507602a370454c2d6 100644 (file)
--- 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)

diff --git a/Mac/Lib/videoreader.py b/Mac/Lib/videoreader.py
index 969187557e6e68d57b008313d782f67fd58fdef7..7b776f2eecf360a60619effc1b3b39c7e117c75f 100644 (file)
--- a/Mac/Lib/videoreader.py
+++ b/Mac/Lib/videoreader.py
@@ -6,12 +6,12 @@
 # Jack Jansen, August 2000
 #
 import sys
-import Qt
-import QuickTime
-import Qd
-import Qdoffs
-import QDOffscreen
-import Res
+from Carbon import Qt
+from Carbon import QuickTime
+from Carbon import Qd
+from Carbon import Qdoffs
+from Carbon import QDOffscreen
+from Carbon import Res
 import MediaDescr
 import imgformat
 import os

diff --git a/Mac/Tools/CGI/BuildCGIApplet.py b/Mac/Tools/CGI/BuildCGIApplet.py
index c94eca954eb9f0baed9e7a6a2376565b2fa7246a..93c39093ac95019128bdf377d11d473e56b3fd0b 100644 (file)
--- a/Mac/Tools/CGI/BuildCGIApplet.py
+++ b/Mac/Tools/CGI/BuildCGIApplet.py
@@ -10,7 +10,7 @@ import sys
 import os
 import macfs
 import MacOS
-import Res
+from Carbon import Res
 import EasyDialogs
 import buildtools
 import py_resource

diff --git a/Mac/Tools/CGI/PythonCGISlave.py b/Mac/Tools/CGI/PythonCGISlave.py
index d2dd90ff7647f66c9c4c00ad1c7f7b4add58a7e0..f14a582daebe789d8304f8bb2ae39cec44cfd1bb 100644 (file)
--- a/Mac/Tools/CGI/PythonCGISlave.py
+++ b/Mac/Tools/CGI/PythonCGISlave.py
@@ -70,7 +70,8 @@ Content-type: text/html
 
 def get_cgi_code():
        # If we're a CGI wrapper, the CGI code resides in a PYC resource.
-       import Res, marshal
+       from Carbon import Res
+       import marshal
        try:
                code = Res.GetNamedResource('PYC ', "CGI_MAIN")
        except Res.Error:

diff --git a/Mac/Tools/IDE/BuildIDE.py b/Mac/Tools/IDE/BuildIDE.py
index 942670acfc49de57e52ade316aca6c992149e37d..7e6586930a5cd45b2f123f87f14eac454dd72883 100644 (file)
--- a/Mac/Tools/IDE/BuildIDE.py
+++ b/Mac/Tools/IDE/BuildIDE.py
@@ -5,7 +5,7 @@ which reduces the startup time (especially on slower machines)."""
 import sys
 import os
 import buildtools
-import Res
+from Carbon import Res
 import py_resource
 
 buildtools.DEBUG=1

diff --git a/Mac/Tools/IDE/FontSettings.py b/Mac/Tools/IDE/FontSettings.py
index 09886ae7cdf4e393c1cf8428e852fde0c4ef4ee3..a41fcbd5502df787266c29526270098576b8370b 100644 (file)
--- a/Mac/Tools/IDE/FontSettings.py
+++ b/Mac/Tools/IDE/FontSettings.py
@@ -8,8 +8,8 @@ if newsettings:
 
 import W
 import PyEdit
-import TextEdit
-import Qd
+from Carbon import TextEdit
+from Carbon import Qd
 import string
 import types
 import sys
@@ -104,7 +104,7 @@ class _FontDialog:
        def set(self, fontsettings):
                font, style, size, color = fontsettings
                if type(font) <> types.StringType:
-                       import Res
+                       from Carbon import Res
                        res = Res.GetResource('FOND', font)
                        font = res.GetResInfo()[2]
                self.w.fontname.set(font)

diff --git a/Mac/Tools/IDE/ModuleBrowser.py b/Mac/Tools/IDE/ModuleBrowser.py
index f5b2b0ab56e3efad88ac26542fc4170754a8eff9..700c2b12d50dc8508e0f333f41672be61afd278b 100644 (file)
--- a/Mac/Tools/IDE/ModuleBrowser.py
+++ b/Mac/Tools/IDE/ModuleBrowser.py
@@ -1,6 +1,6 @@
 import W
 import sys
-import Qd
+from Carbon import Qd
 
 __version__ = "0.2"
 __author__ = "jvr"

diff --git a/Mac/Tools/IDE/ProfileBrowser.py b/Mac/Tools/IDE/ProfileBrowser.py
index f5b4a38ca25e95eecf83a45eb49641c258258c28..51ba75c805e1585d13ac336fecdcd4132f27293d 100644 (file)
--- a/Mac/Tools/IDE/ProfileBrowser.py
+++ b/Mac/Tools/IDE/ProfileBrowser.py
@@ -1,5 +1,5 @@
 import W
-import Evt
+from Carbon import Evt
 
 import sys
 import StringIO

diff --git a/Mac/Tools/IDE/PyBrowser.py b/Mac/Tools/IDE/PyBrowser.py
index c8e5066c4d10bce99e12d537624b56bc76e299f5..308a09dff0b9758476e29121d6dfd8aedda2290d 100644 (file)
--- a/Mac/Tools/IDE/PyBrowser.py
+++ b/Mac/Tools/IDE/PyBrowser.py
@@ -127,7 +127,7 @@ class BrowserWidget(W.List):
                return abs(abscol - x) < 3
        
        def trackcolumn(self, (x, y)):
-               import Qd, QuickDraw, Evt
+               from Carbon import Qd, QuickDraw, Evt
                self.SetPort()
                l, t, r, b = self._bounds
                bounds = l, t, r, b = l + 1, t + 1, r - 16, b - 1

diff --git a/Mac/Tools/IDE/PyConsole.py b/Mac/Tools/IDE/PyConsole.py
index 389834a8b0c5c0caa497f6ae750ca836865815a1..2bb109d03a6a959ee2e4377bd156ed0286d0bf62 100644 (file)
--- a/Mac/Tools/IDE/PyConsole.py
+++ b/Mac/Tools/IDE/PyConsole.py
@@ -1,15 +1,15 @@
 import W
 import Wkeys
-import Fm
+from Carbon import Fm
 import WASTEconst
 from types import *
-import Events
+from Carbon import Events
 import string
 import sys
 import traceback
 import MacOS
 import MacPrefs
-import Qd
+from Carbon import Qd
 import PyInteractive
 
 if not hasattr(sys, 'ps1'):
@@ -178,7 +178,7 @@ class PyConsole(W.Window):
                PyBrowser.Browser(self.consoletext._namespace, self.consoletext._namespace["__name__"])
        
        def clearbuffer(self):
-               import Res
+               from Carbon import Res
                self.consoletext.ted.WEUseText(Res.Resource(''))
                self.consoletext.write(sys.ps1)
                self.consoletext.flush()
@@ -326,7 +326,7 @@ class PyOutput:
                        self.w.outputtext.settabsettings(tabsettings)
        
        def clearbuffer(self):
-               import Res
+               from Carbon import Res
                self.w.outputtext.set('')
        
        def activate(self, onoff):

diff --git a/Mac/Tools/IDE/PyDebugger.py b/Mac/Tools/IDE/PyDebugger.py
index 22ab7a23c84db771c3dd92c60613194ee2f196a8..56a0658c5770a4661f035df66f9be3030d6dfca8 100644 (file)
--- a/Mac/Tools/IDE/PyDebugger.py
+++ b/Mac/Tools/IDE/PyDebugger.py
@@ -6,9 +6,9 @@ import os
 import W
 import WASTEconst
 import PyBrowser
-import Qd
-import Evt
-import Lists
+from Carbon import Qd
+from Carbon import Evt
+from Carbon import Lists
 import MacOS
 _filenames = {}
 
@@ -65,7 +65,7 @@ class Debugger(bdb.Bdb):
        
        def start(self, bottomframe = None, running = 0):
                W.getapplication().DebuggerQuit = bdb.BdbQuit
-               import Menu
+               from Carbon import Menu
                Menu.HiliteMenu(0)
                if self.closed:
                        self.setupwidgets(self.title)

diff --git a/Mac/Tools/IDE/PyDocSearch.py b/Mac/Tools/IDE/PyDocSearch.py
index 4b35e4657e25ae21858f3f6aa0752e9dfb595452..16d2e42ae8e66291fb2fcce8a0940c7b20b6a810 100644 (file)
--- a/Mac/Tools/IDE/PyDocSearch.py
+++ b/Mac/Tools/IDE/PyDocSearch.py
@@ -59,7 +59,7 @@ class TwoLineList(W.List):
        LDEF_ID = 468
        
        def createlist(self):
-               import List
+               from Carbon import List
                self._calcbounds()
                self.SetPort()
                rect = self._bounds

diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py
index d8539c1ef984b897f8206f194fa45ed2fecc464a..7740dfec296190632fd02ddf2027266cb7717bb1 100644 (file)
--- a/Mac/Tools/IDE/PyEdit.py
+++ b/Mac/Tools/IDE/PyEdit.py
@@ -7,9 +7,9 @@ from Wkeys import *
 import macfs
 import MACFS
 import MacOS
-import Win
-import Res
-import Evt
+from Carbon import Win
+from Carbon import Res
+from Carbon import Evt
 import os
 import imp
 import sys
@@ -357,7 +357,7 @@ class Editor(W.Window):
        def close(self):
                if self.editgroup.editor.changed:
                        import EasyDialogs
-                       import Qd
+                       from Carbon import Qd
                        Qd.InitCursor()
                        save = EasyDialogs.AskYesNoCancel('Save window "%s" before closing?' % self.title,
                                        default=1, no="Don\xd5t save")
@@ -948,7 +948,7 @@ class SearchEngine:
                if counter:
                        self.hide()
                        import EasyDialogs
-                       import Res
+                       from Carbon import Res
                        editor.changed = 1
                        editor.selchanged = 1
                        editor.ted.WEUseText(Res.Resource(Text))

diff --git a/Mac/Tools/IDE/PythonIDE.py b/Mac/Tools/IDE/PythonIDE.py
index 9c0902e41e25bf193aeb5c310e8ba23e1f6e439d..bc22e79f4b4f10e65d641dfe16acef6e17ab71be 100644 (file)
--- a/Mac/Tools/IDE/PythonIDE.py
+++ b/Mac/Tools/IDE/PythonIDE.py
@@ -10,10 +10,11 @@ def init():
        import MacOS
        MacOS.EnableAppswitch(-1)
        
-       import Qd, QuickDraw
+       from Carbon import Qd, QuickDraw
        Qd.SetCursor(Qd.GetCursor(QuickDraw.watchCursor).data)
        
-       import Res, sys, os
+       from Carbon import Res
+       import sys, os
        try:
                Res.GetResource('DITL', 468)
        except Res.Error:

diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index 55489e231f22e4001198fe762d6ad22957abca50..4dfa1628cfdbd9f2d0dbd3c4f5168281002a1050 100644 (file)
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -14,7 +14,8 @@ class PythonIDE(Wapplication.Application):
        def __init__(self):
                self.preffilepath = ":Python:PythonIDE preferences"
                Wapplication.Application.__init__(self, 'Pide')
-               import AE, AppleEvents
+               from Carbon import AE
+               from Carbon import AppleEvents
                
                AE.AEInstallEventHandler(AppleEvents.kCoreEventClass, AppleEvents.kAEOpenApplication, 
                                self.ignoreevent)
@@ -123,7 +124,7 @@ class PythonIDE(Wapplication.Application):
                self.makescriptsmenu()
        
        def quitevent(self, theAppleEvent, theReply):
-               import AE
+               from Carbon import AE
                AE.AEInteractWithUser(50000000)
                self._quit()
        

diff --git a/Mac/Tools/IDE/Splash.py b/Mac/Tools/IDE/Splash.py
index 5293295dcc4340bccb75d8b4d0cde2fbf3332fdc..31271cc587bf1a175fcf4192fe8f29548d825eb0 100644 (file)
--- a/Mac/Tools/IDE/Splash.py
+++ b/Mac/Tools/IDE/Splash.py
@@ -1,10 +1,11 @@
-import Dlg
-import Res
+from Carbon import Dlg
+from Carbon import Res
 
 splash = Dlg.GetNewDialog(468, -1)
 splash.DrawDialog()
 
-import Qd, TE, Fm, sys
+from Carbon import Qd, TE, Fm
+import sys
 
 _real__import__ = None
 
@@ -32,7 +33,7 @@ def importing(module):
        Qd.SetPort(splash)
        fontID = Fm.GetFNum("Python-Sans")
        if not fontID:
-               from Fonts import geneva
+               from Carbon.Fonts import geneva
                fontID = geneva
        Qd.TextFont(fontID)
        Qd.TextSize(9)
@@ -68,10 +69,10 @@ def my__import__(name, globals=None, locals=None, fromlist=None):
 #install_importhook()
 
 kHighLevelEvent = 23
-import Win
-from Fonts import *
-from QuickDraw import *
-from TextEdit import *
+from Carbon import Win
+from Carbon.Fonts import *
+from Carbon.QuickDraw import *
+from Carbon.TextEdit import *
 import string
 import sys
 
@@ -130,8 +131,8 @@ def drawtext(what = 0):
 UpdateSplash(1)
 
 def wait():
-       import Evt
-       import Events
+       from Carbon import Evt
+       from Carbon import Events
        global splash
        try:
                splash

diff --git a/Mac/Tools/IDE/Wapplication.py b/Mac/Tools/IDE/Wapplication.py
index 7a9b74a4c2c5b9bfc23caf28b7d8f4ccc7785210..ede6a7654ad420668a0c2e91b2780f22abb0a6a8 100644 (file)
--- a/Mac/Tools/IDE/Wapplication.py
+++ b/Mac/Tools/IDE/Wapplication.py
@@ -1,13 +1,13 @@
 import FrameWork
-import Win
-import Qd
-import Evt
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Evt
 import MacOS
 import Events
 import traceback
 from types import *
 
-import Menu; MenuToolbox = Menu; del Menu
+from Carbon import Menu; MenuToolbox = Menu; del Menu
 
 
 class Application(FrameWork.Application):

diff --git a/Mac/Tools/IDE/Wbase.py b/Mac/Tools/IDE/Wbase.py
index 3c5ab602ec72a0cd254731b7e6479138982c98d8..8e012def97fc7820c8cc2fce08df5bc949f57ed4 100644 (file)
--- a/Mac/Tools/IDE/Wbase.py
+++ b/Mac/Tools/IDE/Wbase.py
@@ -1,7 +1,7 @@
-import Qd
-import Win
-import QuickDraw
-import Evt
+from Carbon import Qd
+from Carbon import Win
+from Carbon import QuickDraw
+from Carbon import Evt
 import string
 from types import *
 import sys

diff --git a/Mac/Tools/IDE/Wcontrols.py b/Mac/Tools/IDE/Wcontrols.py
index 739408408b1fcf577f989b88470e58d7b8767b3f..6742d9f4d59e8862b40d38f73791c706820da8ce 100644 (file)
--- a/Mac/Tools/IDE/Wcontrols.py
+++ b/Mac/Tools/IDE/Wcontrols.py
@@ -1,9 +1,9 @@
-import Ctl
-import Controls
-import Win
+from Carbon import Ctl
+from Carbon import Controls
+from Carbon import Win
 import Wbase
-import Qd
-import Evt
+from Carbon import Qd
+from Carbon import Evt
 
 class ControlWidget(Wbase.ClickableWidget):
        

diff --git a/Mac/Tools/IDE/Wlists.py b/Mac/Tools/IDE/Wlists.py
index dd43a2d79813622ca59d801d8b43e4f9970bed90..04266f7c5d1146bb59453c558bf386e30ab92483 100644 (file)
--- a/Mac/Tools/IDE/Wlists.py
+++ b/Mac/Tools/IDE/Wlists.py
@@ -1,12 +1,12 @@
 import Wbase
 import Wkeys
-import Scrap
+from Carbon import Scrap
 import string
-import Evt
-import Events
-import Qd
-import Win
-import Lists
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Lists
 
 
 class List(Wbase.SelectableWidget):
@@ -39,7 +39,7 @@ class List(Wbase.SelectableWidget):
                self.setdrawingmode(1)
        
        def createlist(self):
-               import List
+               from Carbon import List
                self._calcbounds()
                self.SetPort()
                rect = self._bounds
@@ -371,7 +371,7 @@ class TwoLineList(List):
        LDEF_ID = 468
        
        def createlist(self):
-               import List
+               from Carbon import List
                self._calcbounds()
                self.SetPort()
                rect = self._bounds

diff --git a/Mac/Tools/IDE/Wmenus.py b/Mac/Tools/IDE/Wmenus.py
index a68b95e74a4ad2eebd5bd7b22966527525a64f61..9af50a7d6be8d1435bfd57a45e40796a7be2d78c 100644 (file)
--- a/Mac/Tools/IDE/Wmenus.py
+++ b/Mac/Tools/IDE/Wmenus.py
@@ -1,6 +1,7 @@
 import FrameWork
-import Qd
-import Wbase, Wcontrols, Ctl, Controls
+from Carbon import Qd
+import Wbase, Wcontrols
+from Carbon import Ctl, Controls
 from types import *
 import Wapplication
 
@@ -244,7 +245,7 @@ def _makefontmenu():
 
 
 def _getfontlist():
-       import Res
+       from Carbon import Res
        fontnames = []
        for i in range(1, Res.CountResources('FOND') + 1):
                r = Res.GetIndResource('FOND', i)

diff --git a/Mac/Tools/IDE/Wminiapp.py b/Mac/Tools/IDE/Wminiapp.py
index 3eac613990cc5c8596ec8e9ebef822b70fa6cabc..d48a876efa681549529654e75339ece3674199e1 100644 (file)
--- a/Mac/Tools/IDE/Wminiapp.py
+++ b/Mac/Tools/IDE/Wminiapp.py
@@ -5,7 +5,7 @@ import Wapplication
 class TestApp(Wapplication.Application):
        
        def __init__(self):
-               import Res
+               from Carbon import Res
                Res.FSpOpenResFile("Widgets.rsrc", 1)
                self._menustocheck = []
                self.preffilepath = ":Python:PythonIDE preferences"

diff --git a/Mac/Tools/IDE/Wquicktime.py b/Mac/Tools/IDE/Wquicktime.py
index 79adc1105d1641c73d8e81c96dedb92ddd034446..7170cd7a34164c2f09898dc1d53cc082183f4b38 100644 (file)
--- a/Mac/Tools/IDE/Wquicktime.py
+++ b/Mac/Tools/IDE/Wquicktime.py
@@ -1,10 +1,10 @@
 import os
-import Qd
-import Win
-import Qt, QuickTime
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Qt, QuickTime
 import W
 import macfs
-import Evt, Events
+from Carbon import Evt, Events
 
 _moviesinitialized = 0
 

diff --git a/Mac/Tools/IDE/Wtext.py b/Mac/Tools/IDE/Wtext.py
index 3b8973ad11ff386ec5678b31d3f37a0ccc32e48d..6ca6015e670bd347062e67b076039af4c6029eb8 100644 (file)
--- a/Mac/Tools/IDE/Wtext.py
+++ b/Mac/Tools/IDE/Wtext.py
@@ -1,12 +1,12 @@
-import Qd
-import TE
-import Fm
+from Carbon import Qd
+from Carbon import TE
+from Carbon import Fm
 import waste
 import WASTEconst
-import Res
-import Evt
-import Events
-import Scrap
+from Carbon import Res
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Scrap
 import string
 
 import Win
@@ -15,8 +15,8 @@ import Wkeys
 import Wcontrols
 import PyFontify
 from types import *
-import Fonts
-import TextEdit
+from Carbon import Fonts
+from Carbon import TextEdit
 
 
 
@@ -175,7 +175,7 @@ class EditText(Wbase.SelectableWidget, _ScrollWidget):
                        self.ted.WEUpdate(port.visRgn)
        
        def getfontsettings(self):
-               import Res
+               from Carbon import Res
                (font, style, size, color) = self.ted.WEGetRunInfo(0)[4]
                font = Fm.GetFontName(font)
                return (font, style, size, color)

diff --git a/Mac/Tools/IDE/Wtraceback.py b/Mac/Tools/IDE/Wtraceback.py
index 4960ad08d9ac6801b1213889f82b6c585cebd58c..51b54f36a0ba465dba432b56aa2b9c1e8bfac13a 100644 (file)
--- a/Mac/Tools/IDE/Wtraceback.py
+++ b/Mac/Tools/IDE/Wtraceback.py
@@ -3,7 +3,7 @@ import sys
 import W
 import os
 import types
-import List
+from Carbon import List
 
 
 class TraceBack:

diff --git a/Mac/Tools/IDE/Wwindows.py b/Mac/Tools/IDE/Wwindows.py
index 29c07e58beafb56026ec46d14a2a6975c8e598e1..d4b1a882d88c3052593c410b7bddd26a53fad966 100644 (file)
--- a/Mac/Tools/IDE/Wwindows.py
+++ b/Mac/Tools/IDE/Wwindows.py
@@ -1,12 +1,12 @@
-import Qd
-import Win
-import Evt
-import Fm
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Evt
+from Carbon import Fm
 import FrameWork
-import Windows
-import Events
+from Carbon import Windows
+from Carbon import Events
 import Wbase
-import Dlg
+from Carbon import Dlg
 import MacOS
 import Menu
 import struct
@@ -570,7 +570,7 @@ def FrontWindowInsert(stuff):
        if EasyDialogs.AskYesNoCancel(
                        "Can't find window or widget to insert text into; copy to clipboard instead?", 
                        1) == 1:
-               import Scrap
+               from Carbon import Scrap
                Scrap.ZeroScrap()
                Scrap.PutScrap('TEXT', stuff)
 

diff --git a/Mac/Tools/macfreeze/macfreezegui.py b/Mac/Tools/macfreeze/macfreezegui.py
index c3311b7c30f9ecfac3783e1c6ee5754f75b9a80d..a834138b2a3fc2605bf1ac6e78b98c6b11eaeefc 100644 (file)
--- a/Mac/Tools/macfreeze/macfreezegui.py
+++ b/Mac/Tools/macfreeze/macfreezegui.py
@@ -1,11 +1,11 @@
 """macfreezegui - The GUI for macfreeze"""
-import Dlg
+from Carbon import Dlg
 import macfs
 import EasyDialogs
 import sys
 import os
 import string
-import Res
+from Carbon import Res
 
 ID_MAINDIALOG=512
 

diff --git a/Mac/Tools/macfreeze/macgen_bin.py b/Mac/Tools/macfreeze/macgen_bin.py
index 42aaf40d33fc08f2a42085864e68af2618b74d3d..c72bb3cee3ebb66545e1262e832886632188f3c7 100644 (file)
--- a/Mac/Tools/macfreeze/macgen_bin.py
+++ b/Mac/Tools/macfreeze/macgen_bin.py
@@ -7,7 +7,7 @@ import types
 import macfs
 from MACFS import *
 import MacOS
-import Res
+from Carbon import Res
 import py_resource
 import cfmfile
 import buildtools

diff --git a/Mac/Tools/macfreeze/macgen_rsrc.py b/Mac/Tools/macfreeze/macgen_rsrc.py
index cbf5e0e594f0ee5ac7c9b2ea46f73086347854c8..03fc0af2672351313425f047c36ffe8d1e027768 100644 (file)
--- a/Mac/Tools/macfreeze/macgen_rsrc.py
+++ b/Mac/Tools/macfreeze/macgen_rsrc.py
@@ -1,7 +1,7 @@
 """macgen_info - Generate PYC resource file only"""
 import EasyDialogs
 import py_resource
-import Res
+from Carbon import Res
 import sys
 
 def generate(output, module_dict, debug=0, preload=1):

diff --git a/Mac/Unsupported/findmodulefiles.py b/Mac/Unsupported/findmodulefiles.py
index 267e89e30ce84b725539ffd2a5363ee7c4c259a1..6b3642e185b8a94729c9f7c3ecd0050c17e20702 100644 (file)
--- a/Mac/Unsupported/findmodulefiles.py
+++ b/Mac/Unsupported/findmodulefiles.py
@@ -59,7 +59,7 @@ def findunusedbuiltins(list):
 def mkpycresourcefile(list, main='', dst=None):
        """Copy list-of-modules to resource file dst."""
        import py_resource
-       import Res
+       from Carbon import Res
        import sys
        
        if dst == None:

diff --git a/Mac/Unsupported/mkfrozenresources.py b/Mac/Unsupported/mkfrozenresources.py
index b6787910bac9ee9d01dabd427d6df68135e46231..da09f765bf51931cb27cea83c63755305a117e5f 100644 (file)
--- a/Mac/Unsupported/mkfrozenresources.py
+++ b/Mac/Unsupported/mkfrozenresources.py
@@ -4,7 +4,7 @@
 #
 import macfs
 import py_resource
-import Res
+from Carbon import Res
 import sys
 
 def main():

diff --git a/Mac/scripts/BuildApplication.py b/Mac/scripts/BuildApplication.py
index e9884a475e83f8c4dca46be28c38709a374010ba..ee82b7a9c74824dda12f10aeb22554a4bb388bdb 100644 (file)
--- a/Mac/scripts/BuildApplication.py
+++ b/Mac/scripts/BuildApplication.py
@@ -14,8 +14,8 @@ import string
 import os
 import macfs
 import MacOS
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 import EasyDialogs
 import buildtools
 

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index c1bfb2b5a16db08152c7aca4ce4a7ec133e8b785..423b164b450471bcb3f378ad96f86853c6f05895 100644 (file)
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -13,7 +13,7 @@ import macfs
 import MacOS
 import gestalt
 import string
-import Res
+from Carbon import Res
 
 SPLASH_COPYCORE=512
 SPLASH_COPYCARBON=513
@@ -89,7 +89,7 @@ def ask_copy():
        do_copy = 0
        if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX
                try:
-                       import Dlg
+                       from Carbon import Dlg
                        rv = Dlg.CautionAlert(ALERT_NONBOOT, None)
                        if rv == ALERT_NONBOOT_COPY:
                                do_copy = 1
@@ -141,7 +141,7 @@ def main():
        elif oldcwd != newcwd:
                # Hack to make sure we get the new MACFS
                sys.path.insert(0, os.path.join(oldcwd, ':Mac:Lib'))
-               import Dlg
+               from Carbon import Dlg
                rv = Dlg.CautionAlert(ALERT_NOTPYTHONFOLDER, None)
                if rv == ALERT_NOTPYTHONFOLDER_REMOVE_QUIT:
                        import pythonprefs, preferences
@@ -162,7 +162,7 @@ def main():
        n = n + mkcorealias('PythonCore', 'PythonCore')
        n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
        if n == 0:
-               import Dlg
+               from Carbon import Dlg
                Dlg.CautionAlert(ALERT_NOCORE, None)
                if verbose:
                        print "Warning: PythonCore not copied to Extensions folder"

diff --git a/Mac/scripts/EditPythonPrefs.py b/Mac/scripts/EditPythonPrefs.py
index a03ae78119a4f85493d48f22fbefff2f9d3e5e07..00119e0c7a0b945d478e1ccd3b9d72e4dbeec41b 100644 (file)
--- a/Mac/scripts/EditPythonPrefs.py
+++ b/Mac/scripts/EditPythonPrefs.py
@@ -3,21 +3,21 @@
 # This program is getting more and more clunky. It should really
 # be rewritten in a modeless way some time soon.
 
-from Dlg import *
-from Events import *
-from Res import *
-import Controls
+from Carbon.Dlg import *
+from Carbon.Events import *
+from Carbon.Res import *
+from Carbon import Controls
 import string
 import struct
 import macfs
 import MacOS
 import os
 import sys
-import Res # For Res.Error
+from Carbon import Res # For Res.Error
 import pythonprefs
 import EasyDialogs
 try:
-       import Help
+       from Carbon import Help
 except ImportError:
        Help = None
 

diff --git a/Mac/scripts/MkDistr_ui.py b/Mac/scripts/MkDistr_ui.py
index 15bfa42bb870e143f130126c19992f2773d2c040..3ea78a99dc72700aef4ffc1f721708cc880e3fc5 100644 (file)
--- a/Mac/scripts/MkDistr_ui.py
+++ b/Mac/scripts/MkDistr_ui.py
@@ -12,12 +12,12 @@
 # - Box around lists (???)
 # - Change cursor while busy (need cursor support in Qd)
 #
-import Res
-import Dlg
-import Ctl
-import List
-import Win
-import Qd
+from Carbon import Res
+from Carbon import Dlg
+from Carbon import Ctl
+from Carbon import List
+from Carbon import Win
+from Carbon import Qd
 from FrameWork import *
 import EasyDialogs
 import macfs

diff --git a/Mac/scripts/PackLibDir.py b/Mac/scripts/PackLibDir.py
index 11803186ca2a008ca7c5b49f78b96572e241a873..ba689e66c95716edc83d320877f4f5275f167caa 100644 (file)
--- a/Mac/scripts/PackLibDir.py
+++ b/Mac/scripts/PackLibDir.py
@@ -1,8 +1,8 @@
 #
 # Turn a pyc file into a resource file containing it in 'PYC ' resource form
-from Res import *
-import Res
-from Resources import *
+from Carbon.Res import *
+from Carbon import Res
+from Carbon.Resources import *
 import os
 import macfs
 import sys

diff --git a/Mac/scripts/RunLibScript.py b/Mac/scripts/RunLibScript.py
index 362cb826c927a2fa3eee7aa46050108ccd68aedb..6ecf643a9178f4995b3528e641348e544155dd34 100644 (file)
--- a/Mac/scripts/RunLibScript.py
+++ b/Mac/scripts/RunLibScript.py
@@ -6,7 +6,7 @@ import imp
 import sys
 import os
 import string
-import Dlg
+from Carbon import Dlg
 import macfs
 
 DIALOG_ID = 512
@@ -83,7 +83,7 @@ def interact():
        
 def main():
        curdir = os.getcwd()
-       import Res
+       from Carbon import Res
        try:
                Res.FSpOpenResFile('RunLibScript.rsrc', 1)
        except:

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 11340da962407189e0de5d0fc70f4c311a74a409..f5ccfc92161d0b89f67ae67552e3cd6b5f1fb0b5 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -21,7 +21,7 @@ import string
 import genpluginprojects
 
 import aetools
-import AppleEvents
+from Carbon import AppleEvents
 
 OLDAESUPPORT = 0
 
@@ -33,8 +33,8 @@ if OLDAESUPPORT:
 else:
        import CodeWarrior
 
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 
 import buildtools
 import cfmfile

diff --git a/Mac/scripts/gensuitemodule.py b/Mac/scripts/gensuitemodule.py
index 6549ed2a0320d2a8dd38a491078fde14b8310219..a1ae7744387281bfe0c762533afb3118316f64dd 100644 (file)
--- a/Mac/scripts/gensuitemodule.py
+++ b/Mac/scripts/gensuitemodule.py
@@ -14,7 +14,7 @@ import types
 import StringIO
 import macfs
 
-from Res import *
+from Carbon.Res import *
 
 def main():
        fss, ok = macfs.PromptGetFile('Select file with aeut/aete resource:')

diff --git a/Mac/scripts/mkestrres.py b/Mac/scripts/mkestrres.py
index 3ed3b34f6df89ac9d6f848effe5870d9c75812b2..b0580a25d70a107f0c48e5d1102b4f5455b5eaa6 100644 (file)
--- a/Mac/scripts/mkestrres.py
+++ b/Mac/scripts/mkestrres.py
@@ -3,7 +3,7 @@
 import re
 import macfs
 import string
-import Res
+from Carbon import Res
 import os
 
 READ = 1

diff --git a/Mac/scripts/run.py b/Mac/scripts/run.py
index 4fb040dce2c0ac545032fe09fd768379f88a67a7..75c61290e1014a9c504da78ca439384b6c168162 100644 (file)
--- a/Mac/scripts/run.py
+++ b/Mac/scripts/run.py
@@ -27,7 +27,7 @@ def main():
                #sys.exit(1)
 
 def message(str = "Hello, world!", id = 256):
-       import Dlg
+       from Carbon import Dlg
        d = Dlg.GetNewDialog(id, -1)
        if not d:
                print str