diff options
| author | Georg Brandl <georg@python.org> | 2011-03-06 10:13:00 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-03-06 10:13:00 +0100 |
| commit | 13039c87f14aeed325bcb5fadd202922a614957b (patch) | |
| tree | f78ce4e5acffdb796e9c1803a7b2127100f5fd4f /Lib/platform.py | |
| parent | 80d3610bc36e484fbe7b7ccce366a73314505a16 (diff) | |
| parent | 8256242b30005b8a1b52e79149558ad36f1307d6 (diff) | |
| download | cpython-git-13039c87f14aeed325bcb5fadd202922a614957b.tar.gz | |
Merge build identification to 3.2 branch.
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index b9bc303657..de81b63e32 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -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: |