mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 73415,73417-73418 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73415 | benjamin.peterson | 2009-06-13 09:25:08 -0500 (Sat, 13 Jun 2009) | 1 line

  use 'rc' for release candidates for consistency
........
  r73417 | benjamin.peterson | 2009-06-13 10:42:23 -0500 (Sat, 13 Jun 2009) | 1 line

  special case release candidates
........
  r73418 | benjamin.peterson | 2009-06-13 10:48:04 -0500 (Sat, 13 Jun 2009) | 1 line

  handle different rc format
........
This commit is contained in:
Benjamin Peterson 2009-06-22 19:36:31 +00:00
parent 8be54bb560
commit b48f63433e
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/tools/sphinxext/patchlevel.py
View file

@ -41,7 +41,7 @@ def get_header_version_info(srcdir):
suffixes = { suffixes = {
'PY_RELEASE_LEVEL_ALPHA': 'a', 'PY_RELEASE_LEVEL_ALPHA': 'a',
'PY_RELEASE_LEVEL_BETA': 'b', 'PY_RELEASE_LEVEL_BETA': 'b',
'PY_RELEASE_LEVEL_GAMMA': 'c', 'PY_RELEASE_LEVEL_GAMMA': 'rc',
} }
if level != 'PY_RELEASE_LEVEL_FINAL': if level != 'PY_RELEASE_LEVEL_FINAL':
release += suffixes[level] + str(int(d['PY_RELEASE_SERIAL'])) release += suffixes[level] + str(int(d['PY_RELEASE_SERIAL']))

6
Lib/idlelib/EditorWindow.py
View file

@ -29,8 +29,10 @@ def _sphinx_version():
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: if micro:
release += '%s' % micro release += '%s' % (micro,)
if level != 'final': if level == 'candidate':
release += 'rc%s' % (serial,)
elif level != 'final':
release += '%s%s' % (level[0], serial) release += '%s%s' % (level[0], serial)
return release return release

5
Tools/msi/msi.py
View file

@ -120,7 +120,10 @@ docfile = ""
if micro: if micro:
docfile = str(micro) docfile = str(micro)
if level < 0xf: if level < 0xf:
docfile = '%x%s' % (level, serial) if level == 0xC:
docfile = "rc%s" % (serial,)
else:
docfile = '%x%s' % (level, serial)
docfile = 'python%s%s%s.chm' % (major, minor, docfile) docfile = 'python%s%s%s.chm' % (major, minor, docfile)
# Build the mingw import library, libpythonXY.a # Build the mingw import library, libpythonXY.a