- In PythonIDE, add the Tools/IDE directory as the second entry in

sys.path in stead of as the first, leaving PythonIDE.app/Contents/Resources
as the first one.
- When building the IDE for use with Apple-provided MacPython add
PythonIDEMain.py to the Resources folder.

Together these two makes fixes to PythonIDEMain available to Panther
users.

diff --git a/Mac/OSX/Makefile.panther b/Mac/OSX/Makefile.panther
index 985a88d47b5fc888fa9f9af51c734890bc04c21c..04da5b56b22ab554014e9754578497585bb5253e 100644 (file)
--- a/Mac/OSX/Makefile.panther
+++ b/Mac/OSX/Makefile.panther
@@ -23,6 +23,9 @@ install_IDE:
        $(MAKE) -f Makefile install_IDE \
                BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
                DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
+       # Add the extra file to the resources. This is to work around a bugs in
+       # PythonIDEMain.py in the original 2.3.
+       cp ../Tools/IDE/PythonIDEMain.py $(DESDIR)$(PYTHONAPPSDIR)/PythonIDE.app/Contents/Resources
 
 install_PackageManager:
        $(MAKE) -f Makefile install_PackageManager \

diff --git a/Mac/Tools/IDE/PythonIDE.py b/Mac/Tools/IDE/PythonIDE.py
index b7bc388f087270c633e4d541622eb970d376ad86..fb991b0d90e107dad029e082bb3767065c961b76 100644 (file)
--- a/Mac/Tools/IDE/PythonIDE.py
+++ b/Mac/Tools/IDE/PythonIDE.py
@@ -49,7 +49,7 @@ def init():
                # We are a fully frozen application
                ide_path = sys.argv[0]
        if ide_path not in sys.path:
-               sys.path.insert(0, ide_path)
+               sys.path.insert(1, ide_path)
 
 
 init()