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 e613524af21c356683a5b0666dd50c7c20a8089d..c91a57b7d88d0e47b866db92bc8af863b87fc618 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -8,6 +8,11 @@ What's New in IDLE 3.1a1?
   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,