diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-01 16:15:13 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-01 16:15:13 (GMT) |
commit | cc1c146c7a42e4b10b377f448d841573d74ae442 (patch) | |
tree | 753ca3ee71635a410da40448a4bfba652d4e89f7 /Doc | |
parent | 1c5ae55c85c44fb89bf5890a759086d3dd439d71 (diff) | |
parent | bd31db6f79373ccacd95ae47dbe63850a175ee8f (diff) | |
download | cpython-cc1c146c7a42e4b10b377f448d841573d74ae442.zip cpython-cc1c146c7a42e4b10b377f448d841573d74ae442.tar.gz cpython-cc1c146c7a42e4b10b377f448d841573d74ae442.tar.bz2 |
Merge sphinx changes
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/tools/sphinxext/patchlevel.py | 6 |
1 files 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 |