Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge sphinx changes

This commit is contained in:
Martin v. Löwis 2012-05-01 18:15:13 +02:00
parent 1c5ae55c85 bd31db6f79
commit cc1c146c7a
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/tools/sphinxext/patchlevel.py
View File

@ -34,8 +34,7 @@ def get_header_version_info(srcdir):
release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION']) release = version = '%s.%s' % (d['PY_MAJOR_VERSION'], d['PY_MINOR_VERSION'])
micro = int(d['PY_MICRO_VERSION']) micro = int(d['PY_MICRO_VERSION'])
if micro != 0: release += '.' + str(micro)
release += '.' + str(micro)
level = d['PY_RELEASE_LEVEL'] level = d['PY_RELEASE_LEVEL']
suffixes = { suffixes = {
@ -51,8 +50,7 @@ def get_header_version_info(srcdir):
def get_sys_version_info(): def get_sys_version_info():
major, minor, micro, level, serial = sys.version_info major, minor, micro, level, serial = sys.version_info
release = version = '%s.%s' % (major, minor) release = version = '%s.%s' % (major, minor)
if micro: release += '.%s' % micro
release += '.%s' % micro
if level != 'final': if level != 'final':
release += '%s%s' % (level[0], serial) release += '%s%s' % (level[0], serial)
return version, release return version, release

3
Lib/idlelib/EditorWindow.py
View File

@ -28,8 +28,7 @@ def _sphinx_version():
"Format sys.version_info to produce the Sphinx version string used to install the chm docs" "Format sys.version_info to produce the Sphinx version string used to install the chm docs"
major, minor, micro, level, serial = sys.version_info major, minor, micro, level, serial = sys.version_info
release = '%s%s' % (major, minor) release = '%s%s' % (major, minor)
if micro: release += '%s' % (micro,)
release += '%s' % (micro,)
if level == 'candidate': if level == 'candidate':
release += 'rc%s' % (serial,) release += 'rc%s' % (serial,)
elif level != 'final': elif level != 'final':

4
Tools/msi/msi.py
View File

@ -122,9 +122,7 @@ pythondll_uuid = {
} [major+minor] } [major+minor]
# Compute the name that Sphinx gives to the docfile # Compute the name that Sphinx gives to the docfile
docfile = "" docfile = micro
if int(micro):
docfile = micro
if level < 0xf: if level < 0xf:
if level == 0xC: if level == 0xC:
docfile += "rc%s" % (serial,) docfile += "rc%s" % (serial,)