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
  ........
................

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 00d417513ce41edd85d0bd98a1b58e822ef9ed6b..a8613939b800f55080a1e047e1b53b4e4afd99d2 100644 (file)
--- 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 76cccf07cdb89b056a70162536374f7f78c8cfe1..7bfd2cac2ac90c353fd329b7b002c9eae7dd1284 100644 (file)
--- 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 5e249e277184f15afeb9d6ebf1c47c16bc8f305e..9f92b6c9dab91008d88e3ec212995ab1c902b709 100644 (file)
--- 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', '<<about-idle>>'),
                 None,

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index a5cb3622f2f3408d8b26be2b436bb1a49c1c28a8..f28d1ea1936149eed992b936d5c1f43729f8ed82 100644 (file)
--- 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 2d8da33a8fbe3b60bca1076800af1553ce0042ba..96493ad678711d3e8d5f6ae0edd6f6b4a05917f0 100644 (file)
--- 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"