Merged revisions 71952 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71952 | kurt.kaiser | 2009-04-25 21:33:55 -0400 (Sat, 25 Apr 2009) | 10 lines

  Merged revisions 71812 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r71812 | kurt.kaiser | 2009-04-22 22:36:01 -0400 (Wed, 22 Apr 2009) | 2 lines

    Produce correct version string to access the .chm
    docs on Windows.  Patch 5783 gpolo.  Will port.
  ........
................

diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt
index f8e35d499514ef3dfe591c8e4ac9ee6433c39de5..456079b8ca012fec7cc8284e7924bee16a4f2f7f 100644 (file)
--- a/Lib/idlelib/CREDITS.txt
+++ b/Lib/idlelib/CREDITS.txt
@@ -2,9 +2,9 @@ Guido van Rossum, as well as being the creator of the Python language, is the
 original creator of IDLE.  Other contributors prior to Version 0.8 include
 Mark Hammond, Jeremy Hylton, Tim Peters, and Moshe Zadka.
 
-IDLE's recent development has been carried out in the IDLEfork project.
-The objective was to develop a version of IDLE which had an execution
-environment which could be initialized prior to each run of user code.
+IDLE's recent development was carried out in the SF IDLEfork project. The
+objective was to develop a version of IDLE which had an execution environment
+which could be initialized prior to each run of user code.
 
 The IDLEfork project was initiated by David Scherer, with some help from Peter
 Schneider-Kamp and Nicholas Riley.  David wrote the first version of the RPC
@@ -12,7 +12,7 @@ code and designed a fast turn-around environment for VPython.  Guido developed
 the RPC code and Remote Debugger currently integrated in IDLE.  Bruce Sherwood
 contributed considerable time testing and suggesting improvements.
 
-Besides David and Guido, the main developers who have been active on IDLEfork
+Besides David and Guido, the main developers who were active on IDLEfork
 are Stephen M. Gava, who implemented the configuration GUI, the new
 configuration system, and the About dialog, and Kurt B. Kaiser, who completed
 the integration of the RPC and remote debugger, implemented the threaded
@@ -24,8 +24,9 @@ Noam Raphael (Code Context, Call Tips, many other patches), and Chui Tey (RPC
 integration, debugger integration and persistent breakpoints).
 
 Scott David Daniels, Tal Einat, Hernan Foffani, Christos Georgiou,
-Jim Jewett, Martin v. Löwis, Jason Orendorff, Josh Robb, Nigel Rowe,
-Bruce Sherwood, and Jeff Shute have submitted useful patches.  Thanks, guys!
+Jim Jewett, Martin v. Löwis, Jason Orendorff, Guilherme Polo, Josh Robb,
+Nigel Rowe, Bruce Sherwood, and Jeff Shute have submitted useful patches.
+Thanks, guys!
 
 For additional details refer to NEWS.txt and Changelog.
 

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 00ff88169bc3a9781e70579625d9c885e00df988..cb72c7fe1d4c7dae886b63b03780e24dd4b361c3 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -24,6 +24,16 @@ from idlelib import macosxSupport
 # The default tab setting for a Text widget, in average-width characters.
 TK_TABWIDTH_DEFAULT = 8
 
+def _sphinx_version():
+    "Format sys.version_info to produce the Sphinx version string used to install the chm docs"
+    major, minor, micro, level, serial = sys.version_info
+    release = '%s%s' % (major, minor)
+    if micro:
+        release += '%s' % micro
+    if level != 'final':
+        release += '%s%s' % (level[0], serial)
+    return release
+
 def _find_module(fullname, path=None):
     """Version of imp.find_module() that handles hierarchical module names"""
 
@@ -66,15 +76,13 @@ class EditorWindow(object):
                                            'Doc', 'index.html')
             elif sys.platform[:3] == 'win':
                 chmfile = os.path.join(sys.prefix, 'Doc',
-                                       'Python%d%d.chm' % sys.version_info[:2])
+                                       'Python%s.chm' % _sphinx_version())
                 if os.path.isfile(chmfile):
                     dochome = chmfile
-
             elif macosxSupport.runningAsOSXApp():
                 # documentation is stored inside the python framework
                 dochome = os.path.join(sys.prefix,
                         'Resources/English.lproj/Documentation/index.html')
-
             dochome = os.path.normpath(dochome)
             if os.path.isfile(dochome):
                 EditorWindow.help_url = dochome

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index bdd7bb0c6ed6406750d04b062fdcd7b9f62db5ab..0855131db3911a82245f86125daa3bb312926467 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -13,11 +13,14 @@ What's New in IDLE 3.0.1?
   user configuration of source encoding; all according to
   PEP 3120.
 
-What's New in IDLE 2.7? (UNRELEASED, but merged into 3.0 releases above.)
+What's New in IDLE 2.7? (UNRELEASED, but merged into 3.0.x releases above.)
 =======================
 
 *Release date: XX-XXX-2009*
 
+- Windows: Version string for the .chm help file changed, file not being
+  accessed  Patch 5783 Guilherme Polo
+
 - Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle
   mixed space/tab properly. Issue 5120, patch by Guilherme Polo.