From 24a05f787ed322bc39dc3a226f8ff6fd002d3cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 1 May 2012 16:27:55 +0200 Subject: Include micro version even if it is 0. --- Doc/tools/sphinxext/patchlevel.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Doc/tools/sphinxext/patchlevel.py b/Doc/tools/sphinxext/patchlevel.py index b070d60..bca2eb8 100644 --- a/Doc/tools/sphinxext/patchlevel.py +++ b/Doc/tools/sphinxext/patchlevel.py @@ -34,8 +34,7 @@ def get_header_version_info(srcdir): 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_header_version_info(srcdir): 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 -- cgit v0.12 From 7f9d181d5666f4f3096fa8f3591e37d97a4fa569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 1 May 2012 16:31:18 +0200 Subject: Include micro version even if it is 0. --- Lib/idlelib/EditorWindow.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index de74e58..c32064d 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -28,8 +28,7 @@ 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,) + release += '%s' % (micro,) if level == 'candidate': release += 'rc%s' % (serial,) elif level != 'final': -- cgit v0.12 From bd31db6f79373ccacd95ae47dbe63850a175ee8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 1 May 2012 16:37:44 +0200 Subject: Include micro version even if it is 0. --- Tools/msi/msi.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index ce67978..695a103 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -122,9 +122,7 @@ pythondll_uuid = { } [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,) -- cgit v0.12