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
........
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

View file

@ -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