Backport of 1.9:

Changes by Donovan Preston (and a few minor ones by me) to make IDE run under
MachoPython. Mainly making sure we don't call routines that don't exist
and representing pathnames in a os.separator-neutral format.

These shouldn't interfere too much with Just's work on the next generation IDE,
I hope.

diff --git a/Mac/Tools/IDE/PyDocSearch.py b/Mac/Tools/IDE/PyDocSearch.py
index 208870e3d0b529e297074ed24fb35d015aacf675..98eced916a6f6cbc9d8c6a97048cc91e68823b37 100644 (file)
--- a/Mac/Tools/IDE/PyDocSearch.py
+++ b/Mac/Tools/IDE/PyDocSearch.py
@@ -122,7 +122,8 @@ def dosearch(docpath, searchstring, settings):
        _open = open
        hits = {}
        try:
-               MacOS.EnableAppswitch(0)
+               if hasattr(MacOS, 'EnableAppswitch'):
+                       MacOS.EnableAppswitch(0)
                try:
                        for do, name in books:
                                if not do:
@@ -145,7 +146,8 @@ def dosearch(docpath, searchstring, settings):
                                        if filehits:
                                                hits[fullpath] = filehits
                finally:
-                       MacOS.EnableAppswitch(-1)
+                       if hasattr(MacOS, 'EnableAppswitch'):
+                               MacOS.EnableAppswitch(-1)
                        status.close()
        except KeyboardInterrupt:
                pass

diff --git a/Mac/Tools/IDE/PythonIDE.py b/Mac/Tools/IDE/PythonIDE.py
index 5ebe97afe29229fb63f05f5c3887bba5dfbcf1f1..a2041e0e55c25b73510f762fe32249175392d21a 100644 (file)
--- a/Mac/Tools/IDE/PythonIDE.py
+++ b/Mac/Tools/IDE/PythonIDE.py
@@ -4,11 +4,13 @@
 # it like the "normal" interpreter.
 
 __version__ = '1.0.1'
-
+import sys
+import os
 
 def init():
        import MacOS
-       MacOS.EnableAppswitch(-1)
+       if hasattr(MacOS, 'EnableAppswitch'):
+               MacOS.EnableAppswitch(-1)
        
        from Carbon import Qd, QuickDraw
        Qd.SetCursor(Qd.GetCursor(QuickDraw.watchCursor).data)
@@ -16,11 +18,13 @@ def init():
        import macresource
        import sys, os
        macresource.need('DITL', 468, "PythonIDE.rsrc")
-       widgetresfile = os.path.join(sys.exec_prefix, ":Mac:Tools:IDE:Widgets.rsrc")
+       widgetrespathsegs = [sys.exec_prefix, "Mac", "Tools", "IDE", "Widgets.rsrc"]
+       widgetresfile = os.path.join(*widgetrespathsegs)
        refno = macresource.need('CURS', 468, widgetresfile)
        if refno:
                # We're not a fullblown application
-               ide_path = os.path.join(sys.exec_prefix, ":Mac:Tools:IDE")
+               idepathsegs = [sys.exec_prefix, "Mac", "Tools", "IDE"]
+               ide_path = os.path.join(*idepathsegs)
        else:
                # We are a fully frozen application
                ide_path = sys.argv[0]