Adapt platform and test_platform to the build identification changes.
This commit is contained in:
parent
1ca2e7965c
commit
8256242b30
|
@ -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:
|
||||
|
|
|
@ -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])
|
||||
|
|
Loading…
Reference in New Issue