diff options
| author | Ned Deily <nad@acm.org> | 2013-10-27 05:23:20 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-10-27 05:23:20 (GMT) |
| commit | b9dcfea092fa223de2a89c8eae6bb4e7dc2d8959 (patch) | |
| tree | bbe24ef4509588cdfea23c5618bc2bad3d3d89ce /Mac | |
| parent | 624a74e4b775c93293f5dece9f6ed8407d2aec9f (diff) | |
| parent | 246eb1105842c746a80865cd492502ad413949c2 (diff) | |
| download | cpython-b9dcfea092fa223de2a89c8eae6bb4e7dc2d8959.zip cpython-b9dcfea092fa223de2a89c8eae6bb4e7dc2d8959.tar.gz cpython-b9dcfea092fa223de2a89c8eae6bb4e7dc2d8959.tar.bz2 | |
Issue Issue #15663: merge from 3.3
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py | 4 | ||||
| -rw-r--r-- | Mac/Makefile.in | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py index d6803ba..8b8beb9 100644 --- a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py +++ b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py @@ -48,7 +48,7 @@ os.chdir(os.path.expanduser('~/Documents')) # the interpreter in the framework, by following the symlink # exported in PYTHONEXECUTABLE. pyex = os.environ['PYTHONEXECUTABLE'] -sys.executable = os.path.join(os.path.dirname(pyex), os.readlink(pyex)) +sys.executable = os.path.join(sys.prefix, 'bin', 'python%d.%d'%(sys.version_info[:2])) # Remove any sys.path entries for the Resources dir in the IDLE.app bundle. p = pyex.partition('.app') @@ -68,6 +68,8 @@ for idx, value in enumerate(sys.argv): break # Now it is safe to import idlelib. +from idlelib import macosxSupport +macosxSupport._appbundle = True from idlelib.PyShell import main if __name__ == '__main__': main() diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 354c1fd..5cb664d 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -166,6 +166,10 @@ install_IDLE: -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -rf "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" /bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)" ln -sf "$(INSTALLED_PYTHONAPP)" "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python" +ifneq ($(LIPO_32BIT_FLAGS),) + rm "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python" + lipo $(LIPO_32BIT_FLAGS) -output "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python" "$(BUILDPYTHON)" +endif sed -e "s!%prefix%!$(prefix)!g" -e 's!%exe%!$(PYTHONFRAMEWORK)!g' < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE" sed "s!%version%!`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`!g" < "$(srcdir)/IDLE/IDLE.app/Contents/Info.plist" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/Info.plist" if [ -f "$(DESTDIR)$(LIBDEST)/idlelib/config-main.def" ]; then \ |