[Python-checkins] cpython (merge default -> default): Merge sphinx changes

Tue May 1 18:16:01 CEST 2012

http://hg.python.org/cpython/rev/9ea07e65ed2a
changeset: 76704:9ea07e65ed2a
parent: 76700:bec267540811
parent: 76703:8513a7fbd301
user: Martin v. Löwis <martin at v.loewis.de>
date: Tue May 01 18:15:13 2012 +0200
summary:
 Merge sphinx changes
files:
 Doc/tools/sphinxext/patchlevel.py | 6 ++----
 Lib/idlelib/EditorWindow.py | 3 +--
 Tools/msi/msi.py | 4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Doc/tools/sphinxext/patchlevel.py b/Doc/tools/sphinxext/patchlevel.py
--- a/Doc/tools/sphinxext/patchlevel.py
+++ b/Doc/tools/sphinxext/patchlevel.py
@@ -34,8 +34,7 @@
 
 release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION'])
 micro = int(d['PY_MICRO_VERSION'])
- if micro != 0:
- release += '.' + str(micro)
+ release += '.' + str(micro)
 
 level = d['PY_RELEASE_LEVEL']
 suffixes = {
@@ -51,8 +50,7 @@
 def get_sys_version_info():
 major, minor, micro, level, serial = sys.version_info
 release = version = '%s.%s' % (major, minor)
- if micro:
- release += '.%s' % micro
+ release += '.%s' % micro
 if level != 'final':
 release += '%s%s' % (level[0], serial)
 return version, release
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -28,8 +28,7 @@
 "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,)
+ release += '%s' % (micro,)
 if level == 'candidate':
 release += 'rc%s' % (serial,)
 elif level != 'final':
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -122,9 +122,7 @@
 } [major+minor]
 
 # Compute the name that Sphinx gives to the docfile
-docfile = ""
-if int(micro):
- docfile = micro
+docfile = micro
 if level < 0xf:
 if level == 0xC:
 docfile += "rc%s" % (serial,)
-- 
Repository URL: http://hg.python.org/cpython
