Backport of 1.9 (missed last time around):

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.

diff --git a/Mac/Tools/IDE/PyDebugger.py b/Mac/Tools/IDE/PyDebugger.py
index 4bbac262ca2127e76748c502ea45e394d45f7ae8..74bfc74d34bd997db059eeeb2d816a06fc354c38 100644 (file)
--- a/Mac/Tools/IDE/PyDebugger.py
+++ b/Mac/Tools/IDE/PyDebugger.py
@@ -496,7 +496,8 @@ class Debugger(bdb.Bdb):
                        self.w.panes.bottom.tracingmonitor.toggle()
                try:
                        try:
-                               MacOS.EnableAppswitch(0)
+                               if hasattr(MacOS, 'EnableAppswitch'):
+                                       MacOS.EnableAppswitch(0)
                                if self.quitting:
                                        # returning None is not enough, a former BdbQuit exception
                                        # might have been eaten by the print statement
@@ -512,7 +513,8 @@ class Debugger(bdb.Bdb):
                                print 'bdb.Bdb.dispatch: unknown debugging event:', `event`
                                return self.trace_dispatch
                        finally:
-                               MacOS.EnableAppswitch(-1)
+                               if hasattr(MacOS, 'EnableAppswitch'):
+                                       MacOS.EnableAppswitch(-1)
                except KeyboardInterrupt:
                        self.set_step()
                        return self.trace_dispatch