[Python-checkins] r71953 - in python/branches/release30-maint: Lib/idlelib/CREDITS.txt Lib/idlelib/EditorWindow.py Lib/idlelib/NEWS.txt

[kurt.kaiser]

Author: kurt.kaiser
Date: Sun Apr 26 04:05:55 2009
New Revision: 71953

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


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/idlelib/CREDITS.txt
   python/branches/release30-maint/Lib/idlelib/EditorWindow.py
   python/branches/release30-maint/Lib/idlelib/NEWS.txt

Modified: python/branches/release30-maint/Lib/idlelib/CREDITS.txt
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/CREDITS.txt	(original)
+++ python/branches/release30-maint/Lib/idlelib/CREDITS.txt	Sun Apr 26 04:05:55 2009
@@ -2,9 +2,9 @@
 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 @@
 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 @@
 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.
 

Modified: python/branches/release30-maint/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/release30-maint/Lib/idlelib/EditorWindow.py	Sun Apr 26 04:05:55 2009
@@ -24,6 +24,16 @@
 # 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 @@
                                            '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

Modified: python/branches/release30-maint/Lib/idlelib/NEWS.txt
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/NEWS.txt	(original)
+++ python/branches/release30-maint/Lib/idlelib/NEWS.txt	Sun Apr 26 04:05:55 2009
@@ -13,11 +13,14 @@
   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.