[Python-checkins] r68809 - in python/branches/py3k: Lib/idlelib/EditorWindow.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Jan 20 16:01:54 2009
New Revision: 68809

Log:
Merged revisions 68797,68801 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68797 | raymond.hettinger | 2009-01-20 01:11:47 -0600 (Tue, 20 Jan 2009) | 11 lines
  
  Don't disrupt automatic url target name generation
  with manually specified, conflicting names.
  
  Before: 
      http://docs.python.org/dev/library/collections.html#id1
  
  After:
      http://docs.python.org/dev/library/collections.html#counter-objects
........
  r68801 | raymond.hettinger | 2009-01-20 04:46:23 -0600 (Tue, 20 Jan 2009) | 5 lines
  
  Use Georg's new permalinks to documentation by version number.
  That assures that IDLE's help always points to the correct
  version and the latest update with all bug fixes.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/idlelib/EditorWindow.py

Modified: python/branches/py3k/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/EditorWindow.py	Tue Jan 20 16:01:54 2009
@@ -82,7 +82,7 @@
                     # Safari requires real file:-URLs
                     EditorWindow.help_url = 'file://' + EditorWindow.help_url
             else:
-                EditorWindow.help_url = "http://docs.python.org/dev/3.0/"
+                EditorWindow.help_url = "http://docs.python.org/%d.%d" % sys.version_info[:2]
         currentTheme=idleConf.CurrentTheme()
         self.flist = flist
         root = root or flist.root