diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-06-22 19:36:31 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-06-22 19:36:31 (GMT) |
| commit | b48f63433eca50588597d70cfe140e07e3bc085f (patch) | |
| tree | b6c2e3c7a0d845e9861917a4b3e65e0a90436e9b | |
| parent | 8be54bb5602235fde8f1516c3c0294f272f6f4a4 (diff) | |
| download | cpython-b48f63433eca50588597d70cfe140e07e3bc085f.zip cpython-b48f63433eca50588597d70cfe140e07e3bc085f.tar.gz cpython-b48f63433eca50588597d70cfe140e07e3bc085f.tar.bz2 | |
Merged revisions 73415,73417-73418 via svnmerge from
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
........
| -rw-r--r-- | Doc/tools/sphinxext/patchlevel.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 6 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Doc/tools/sphinxext/patchlevel.py b/Doc/tools/sphinxext/patchlevel.py index cb9e35c..082858e 100644 --- a/Doc/tools/sphinxext/patchlevel.py +++ b/Doc/tools/sphinxext/patchlevel.py @@ -41,7 +41,7 @@ def get_header_version_info(srcdir): suffixes = { 'PY_RELEASE_LEVEL_ALPHA': 'a', 'PY_RELEASE_LEVEL_BETA': 'b', - 'PY_RELEASE_LEVEL_GAMMA': 'c', + 'PY_RELEASE_LEVEL_GAMMA': 'rc', } if level != 'PY_RELEASE_LEVEL_FINAL': release += suffixes[level] + str(int(d['PY_RELEASE_SERIAL'])) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index a38cdd1..c1e9e1e 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -29,8 +29,10 @@ def _sphinx_version(): major, minor, micro, level, serial = sys.version_info release = '%s%s' % (major, minor) if micro: - release += '%s' % micro - if level != 'final': + release += '%s' % (micro,) + if level == 'candidate': + release += 'rc%s' % (serial,) + elif level != 'final': release += '%s%s' % (level[0], serial) return release diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 986852a..95c07bc 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -120,7 +120,10 @@ docfile = "" if micro: docfile = str(micro) 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) # Build the mingw import library, libpythonXY.a |