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/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index cee7767..a38cdd1 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -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