Merge build identification to 3.2 branch.

This commit is contained in:
Georg Brandl 2011-03-06 10:13:00 +01:00
commit 13039c87f1
8 changed files with 128 additions and 7 deletions

View file

@ -1392,7 +1392,9 @@ def _sys_version(sys_version=None):
name = 'CPython'
builddate = builddate + ' ' + buildtime
if hasattr(sys, 'subversion'):
if hasattr(sys, '_mercurial'):
_, branch, revision = sys._mercurial
elif hasattr(sys, 'subversion'):
# sys.subversion was added in Python 2.5
_, branch, revision = sys.subversion
else: