From 834b7ab909a486b73428012e9ce925be0cec3918 Mon Sep 17 00:00:00 2001 From: "Kurt B. Kaiser" Date: Sat, 25 Apr 2009 17:26:39 +0000 Subject: [PATCH] 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. ........ Also, I straightened out NEWS.txt, bumped idlever.py, and updated CREDITS.txt. --- Lib/idlelib/CREDITS.txt | 13 +++++++------ Lib/idlelib/EditorWindow.py | 14 +++++++++++--- Lib/idlelib/NEWS.txt | 23 +++++++++++++++++++---- Lib/idlelib/idlever.py | 2 +- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt index 30561a9ea9..456079b8ca 100644 --- 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 104b63baf4..6744c911af 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -22,6 +22,16 @@ 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""" @@ -64,15 +74,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 0b6fa61b75..2d74be4e3f 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,7 +1,22 @@ -What's New in IDLE 2.6a3? -========================= +What's New in IDLE 2.6.3rc1? +============================ + +*Release date: XX-XXX-2009* + +- Windows: Version string for the .chm help file changed, file not being + accessed Patch 5783 Guilherme Polo + +What's New in IDLE 2.6.2rc1? +============================ + +*Release date: 06-Apr-2009* + +- Issue #3549: On MacOS the preferences menu was not present + +What's New in IDLE 2.6? +======================= -*Release date: XX-XXX-2008* +*Release date: 01-Oct-2008* - Issue #2665: On Windows, an IDLE installation upgraded from an old version would not start if a custom theme was defined. @@ -23,7 +38,7 @@ What's New in IDLE 2.6a1? in the config dialog would cause non-Python files to be colored as if they were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat. -- ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat. +- ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat - There was an error on exit if no sys.exitfunc was defined. Issue 1647. diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index d045694ca9..ba9dbbd9bb 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "2.6.2" +IDLE_VERSION = "2.6.3rc1" -- 2.49.0