From 9bf43c2d5af481ca45d0dd2da5e188030da92b98 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 2 Jan 2009 17:01:59 +0000 Subject: 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 (Fri, 02 Jan 2009) | 2 lines Fix for issue 3433 ................ r68155 | ronald.oussoren | 2009-01-02 07:10:34 -0600 (Fri, 02 Jan 2009) | 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 (Fri, 02 Jan 2009) | 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 ........ ................ --- Lib/idlelib/NEWS.txt | 5 +++++ Lib/idlelib/help.txt | 5 ++++- Lib/idlelib/macosxSupport.py | 4 +++- Mac/Makefile.in | 4 ++-- Mac/PythonLauncher/Makefile.in | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 00d4175..a861393 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -8,6 +8,11 @@ What's New in IDLE 3.0.1? 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? ========================= diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt index 76cccf0..7bfd2ca 100644 --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -90,7 +90,10 @@ Options Menu: 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 diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py index 5e249e2..9f92b6c 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -89,7 +89,9 @@ def overrideRootMenu(root, flist): ###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', '<>'), None, diff --git a/Mac/Makefile.in b/Mac/Makefile.in index a5cb362..f28d1ea 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -216,9 +216,9 @@ install_Python4way: install_Python 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" diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in index 2d8da33..96493ad 100644 --- a/Mac/PythonLauncher/Makefile.in +++ b/Mac/PythonLauncher/Makefile.in @@ -27,7 +27,7 @@ OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController. 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" -- cgit v0.12