Changeset 391 for python/trunk/Mac/IDLE

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Mac/IDLE/Info.plist.in (modified) (2 diffs)
• Mac/IDLE/Makefile.in (modified) (3 diffs)
• Mac/IDLE/config-extensions.def (modified) (1 diff)
• Mac/IDLE/idlemain.py (modified) (2 diffs)

python/trunk/Mac/IDLE/Info.plist.in

@@ -37 +37 @@
         <string>IDLE</string>
         <key>CFBundleGetInfoString</key>
-        <string>%VERSION%, © 001-2006 Python Software Foundation</string>
+        <string>%VERSION%, © 2001-2013 Python Software Foundation</string>
         <key>CFBundleIconFile</key>
         <string>IDLE.icns</string>
@@ -52 +52 @@
         <key>CFBundleVersion</key>
         <string>%VERSION%</string>
+        <key>NSHighResolutionCapable</key>
+        <true/>
+<!--
+        <key>LSMinimumSystemVersionByArchitecture</key>
+        <dict>
+            <key>x86_64</key>
+            <string>10.6.0</string>
+            <key>ppc64</key>
+            <string>10.6.0</string>
+        </dict>
+-->
 </dict>
 </plist>

python/trunk/Mac/IDLE/Makefile.in

@@ -11 +11 @@
 builddir=       ../..
 PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
+LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
+
 
 RUNSHARED=      @RUNSHARED@
@@ -23 +25 @@
 BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
 
-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
+PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION)
 
 all: IDLE.app
@@ -52 +54 @@
                 --resource=$(srcdir)/../Icons/PythonSource.icns \
                 --resource=$(srcdir)/../Icons/PythonCompiled.icns \
-                --python=$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)`test -f "$(DESTDIR)$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)-32" && echo "-32"`  \
+                --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
                 build
-
+ifneq ($(LIPO_32BIT_FLAGS),)
+        rm "IDLE.app/Contents/MacOS/Python"
+        lipo $(LIPO_32BIT_FLAGS) -output "IDLE.app/Contents/MacOS/Python" "$(BUILDPYTHON)"
+endif
 
 Info.plist: $(srcdir)/Info.plist.in

python/trunk/Mac/IDLE/config-extensions.def

@@ -87 +87 @@
 [CodeContext_bindings]
 toggle-code-context=
+
+[RstripExtension]
+enable=1
+enable_shell=0
+enable_editor=1

python/trunk/Mac/IDLE/idlemain.py

@@ -49 +49 @@
 # 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.
@@ -69 +69 @@
 
 # Now it is safe to import idlelib.
+from idlelib import macosxSupport
+macosxSupport._appbundle = True
 from idlelib.PyShell import main
 if __name__ == '__main__':