cpython: b6a1a78818fe (original) (raw)
Mercurial > cpython
changeset 86670:b6a1a78818fe
Issue Issue #15663: merge from 3.3 [#15663]
| Ned Deily nad@acm.org | |
|---|---|
| date | Sat, 26 Oct 2013 22:23:20 -0700 |
| parents | 1927b7c01c78(current diff)0bf4cf62f14c(diff) |
| children | d6f427f94d85 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-)[+] [-] Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py 4 Mac/Makefile.in 4 |
line wrap: on
line diff
--- 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()
--- 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 (LIPO32BITFLAGS)−output"(LIPO_32BIT_FLAGS) -output "(LIPO32BITFLAGS)−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) <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>B</mi><mi>U</mi><mi>I</mi><mi>L</mi><mi>D</mi><mi>P</mi><mi>Y</mi><mi>T</mi><mi>H</mi><mi>O</mi><mi>N</mi><mo stretchy="false">)</mo><mo>−</mo><msup><mi>c</mi><mo mathvariant="normal" lspace="0em" rspace="0em">′</mo></msup><mi>i</mi><mi>m</mi><mi>p</mi><mi>o</mi><mi>r</mi><mi>t</mi><mi>p</mi><mi>l</mi><mi>a</mi><mi>t</mi><mi>f</mi><mi>o</mi><mi>r</mi><mi>m</mi><mo separator="true">;</mo><mi>p</mi><mi>r</mi><mi>i</mi><mi>n</mi><mi>t</mi><mo stretchy="false">(</mo><mi>p</mi><mi>l</mi><mi>a</mi><mi>t</mi><mi>f</mi><mi>o</mi><mi>r</mi><mi>m</mi><mi mathvariant="normal">.</mi><mi>p</mi><mi>y</mi><mi>t</mi><mi>h</mi><mi>o</mi><msub><mi>n</mi><mi>v</mi></msub><mi>e</mi><mi>r</mi><mi>s</mi><mi>i</mi><mi>o</mi><mi>n</mi><mo stretchy="false">(</mo><mo stretchy="false">)</mo><msup><mo stretchy="false">)</mo><mo mathvariant="normal" lspace="0em" rspace="0em">′</mo></msup><mi mathvariant="normal">‘</mi><mo stretchy="false">!</mo><mi>g</mi><mi mathvariant="normal">"</mi><mo><</mo><mi mathvariant="normal">"</mi></mrow><annotation encoding="application/x-tex">(BUILDPYTHON) -c 'import platform; print(platform.python_version())'!g" < "(BUILDPYTHON)−c′importplatform;print(platform.pythonversion())′‘!g"<"(srcdir)/IDLE/IDLE.app/Contents/Info.plist" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/Info.plist"
if [ -f "$(DESTDIR)$(LIBDEST)/idlelib/config-main.def" ]; then [](#l2.13)