[Python-checkins] r68164 - in python/branches/release30-maint: Lib/idlelib/NEWS.txt Lib/idlelib/help.txt Lib/idlelib/macosxSupport.py Mac/Makefile.in Mac/PythonLauncher/Makefile.in

Fri Jan 2 18:01:59 CET 2009

Author: benjamin.peterson
Date: Fri Jan 2 18:01:59 2009
New Revision: 68164
Log:
Merged revisions 68152,68155 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r68152 | ronald.oussoren | 2009年01月02日 05:48:29 -0600 (2009年1月02日) | 2 lines
 
 Fix for issue 3433
................
 r68155 | ronald.oussoren | 2009年01月02日 07:10:34 -0600 (2009年1月02日) | 17 lines
 
 Recorded merge of revisions 68153 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r68153 | ronald.oussoren | 2009年01月02日 13:59:32 +0100 (2009年1月02日) | 10 lines
 
 Fix for issue3559: No preferences menu in IDLE on OSX
 
 1) Add a comment to the help file to that points to the 
 preferences menu.
 
 2) An earlier checkin tried to detect Tk >= 8.10.14,
 but did this in the wrong way. The end result of this
 was that the IDLE->Preferences... menu got surpressed
 when using the system version of Tcl/Tk
 ........
................
Modified:
 python/branches/release30-maint/Lib/idlelib/NEWS.txt
 python/branches/release30-maint/Lib/idlelib/help.txt
 python/branches/release30-maint/Lib/idlelib/macosxSupport.py
 python/branches/release30-maint/Mac/Makefile.in
 python/branches/release30-maint/Mac/PythonLauncher/Makefile.in
Modified: python/branches/release30-maint/Lib/idlelib/NEWS.txt
==============================================================================

--- python/branches/release30-maint/Lib/idlelib/NEWS.txt	(original)
+++ python/branches/release30-maint/Lib/idlelib/NEWS.txt	Fri Jan 2 18:01:59 2009
@@ -8,6 +8,11 @@
 user configuration of source encoding; all according to
 PEP 3120.
 
+- Issue #3549: On MacOS the preferences menu was not present
+
+- Issue #2665: On Windows, an IDLE installation upgraded from an old version
+ would not start if a custom theme was defined.
+
 
 What's New in IDLE 3.0a3?
 =========================
Modified: python/branches/release30-maint/Lib/idlelib/help.txt
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/help.txt	(original)
+++ python/branches/release30-maint/Lib/idlelib/help.txt	Fri Jan 2 18:01:59 2009
@@ -90,7 +90,10 @@
 	Configure IDLE -- Open a configuration dialog. Fonts, indentation,
 keybindings, and color themes may be altered.
 Startup Preferences may be set, and Additional Help
- Souces can be specified.
+ Sources can be specified.
+			 
+			 On MacOS X this menu is not present, use
+			 menu 'IDLE -> Preferences...' instead.
 	---
 	Code Context --	 Open a pane at the top of the edit window which
 			 shows the block context of the section of code
Modified: python/branches/release30-maint/Lib/idlelib/macosxSupport.py
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/macosxSupport.py	(original)
+++ python/branches/release30-maint/Lib/idlelib/macosxSupport.py	Fri Jan 2 18:01:59 2009
@@ -89,7 +89,9 @@
 
 ###check if Tk version >= 8.4.14; if so, use hard-coded showprefs binding
 tkversion = root.tk.eval('info patchlevel')
- if tkversion >= '8.4.14':
+ # Note: we cannot check if the string tkversion >= '8.4.14', because
+ # the string '8.4.7' is greater than the string '8.4.14'.
+ if tuple(map(int, tkversion.split('.'))) >= (8, 4, 14):
 Bindings.menudefs[0] = ('application', [
 ('About IDLE', '<<about-idle>>'),
 None,
Modified: python/branches/release30-maint/Mac/Makefile.in
==============================================================================
--- python/branches/release30-maint/Mac/Makefile.in	(original)
+++ python/branches/release30-maint/Mac/Makefile.in	Fri Jan 2 18:01:59 2009
@@ -216,9 +216,9 @@
 install_IDLE:
 	test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
 	-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
-	cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
+	/bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
 	ln -sf $(INSTALLED_PYTHONAPP) "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
-	sed "s!%prefix%!$(prefix)!g" < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
+	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"
 	touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
 
Modified: python/branches/release30-maint/Mac/PythonLauncher/Makefile.in
==============================================================================
--- python/branches/release30-maint/Mac/PythonLauncher/Makefile.in	(original)
+++ python/branches/release30-maint/Mac/PythonLauncher/Makefile.in	Fri Jan 2 18:01:59 2009
@@ -27,7 +27,7 @@
 install: Python\ Launcher.app
 	test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)"
 	-test -d "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app"
-	cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
+	/bin/cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
 	touch "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app"
 
 
