From: Georg Brandl <georg@python.org>
Date: Sat, 5 Mar 2011 20:09:22 +0000 (+0100)
Subject: Adapt platform and test_platform to the build identification changes.
X-Git-Tag: v3.2.1b1~343^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8256242b30005b8a1b52e79149558ad36f1307d6;p=thirdparty%2FPython%2Fcpython.git

Adapt platform and test_platform to the build identification changes.
---

diff --git a/Lib/platform.py b/Lib/platform.py
index 7fba14364200..780301d264fa 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1373,7 +1373,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:
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 4fd286abad03..2f688a4f1872 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -51,11 +51,13 @@ class PlatformTest(unittest.TestCase):
     def setUp(self):
         self.save_version = sys.version
         self.save_subversion = sys.subversion
+        self.save_mercurial = sys._mercurial
         self.save_platform = sys.platform
 
     def tearDown(self):
         sys.version = self.save_version
         sys.subversion = self.save_subversion
+        sys._mercurial = self.save_mercurial
         sys.platform = self.save_platform
 
     def test_sys_version(self):
@@ -103,10 +105,12 @@ class PlatformTest(unittest.TestCase):
                 sys_versions.items():
             sys.version = version_tag
             if subversion is None:
+                if hasattr(sys, "_mercurial"):
+                    del sys._mercurial
                 if hasattr(sys, "subversion"):
                     del sys.subversion
             else:
-                sys.subversion = subversion
+                sys._mercurial = subversion
             if sys_platform is not None:
                 sys.platform = sys_platform
             self.assertEqual(platform.python_implementation(), info[0])