diff options
| -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 |