diff options
Diffstat (limited to 'Mac/scripts')
| -rw-r--r-- | Mac/scripts/BuildApplication.py | 4 | ||||
| -rw-r--r-- | Mac/scripts/ConfigurePython.py | 8 | ||||
| -rw-r--r-- | Mac/scripts/EditPythonPrefs.py | 12 | ||||
| -rw-r--r-- | Mac/scripts/MkDistr_ui.py | 12 | ||||
| -rw-r--r-- | Mac/scripts/PackLibDir.py | 6 | ||||
| -rw-r--r-- | Mac/scripts/RunLibScript.py | 4 | ||||
| -rw-r--r-- | Mac/scripts/fullbuild.py | 6 | ||||
| -rw-r--r-- | Mac/scripts/gensuitemodule.py | 2 | ||||
| -rw-r--r-- | Mac/scripts/mkestrres.py | 2 | ||||
| -rw-r--r-- | Mac/scripts/run.py | 2 |
10 files changed, 29 insertions, 29 deletions
diff --git a/Mac/scripts/BuildApplication.py b/Mac/scripts/BuildApplication.py index e9884a4..ee82b7a 100644 --- 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 c1bfb2b..423b164 100644 --- 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 a03ae78..00119e0 100644 --- 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 15bfa42..3ea78a9 100644 --- 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 1180318..ba689e6 100644 --- 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 362cb82..6ecf643 100644 --- 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 11340da..f5ccfc9 100644 --- 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 6549ed2..a1ae774 100644 --- 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 3ed3b34..b0580a2 100644 --- 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 4fb040d..75c6129 100644 --- 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 |