From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sat, 1 Nov 2003 22:30:50 +0000 (+0000)
Subject: - In PythonIDE, add the Tools/IDE directory as the second entry in
X-Git-Tag: v2.3.3c1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f980d0a7ab4b627c0eecf84676385bd003aeaf0;p=thirdparty%2FPython%2Fcpython.git

- 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 985a88d47b5f..04da5b56b22a 100644
--- 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 b7bc388f0872..fb991b0d90e1 100644
--- 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()