From b48f63433eca50588597d70cfe140e07e3bc085f Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 22 Jun 2009 19:36:31 +0000 Subject: 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 ........ --- Lib/idlelib/EditorWindow.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Lib/idlelib/EditorWindow.py') diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index a38cdd11759..c1e9e1e7ff9 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 -- cgit v1.2.3