--- a/Lib/test/test_sys.py Sat Jun 09 17:31:59 2012 +0100 +++ b/Lib/test/test_sys.py Mon May 21 23:01:17 2012 -0400 @@ -419,7 +419,6 @@ self.assertIsInstance(sys.builtin_module_names, tuple) self.assertIsInstance(sys.copyright, str) self.assertIsInstance(sys.exec_prefix, str) - self.assertIsInstance(sys.base_exec_prefix, str) self.assertIsInstance(sys.executable, str) self.assertEqual(len(sys.float_info), 11) self.assertEqual(sys.float_info.radix, 2) @@ -451,7 +450,6 @@ self.assertEqual(sys.maxunicode, 0x10FFFF) self.assertIsInstance(sys.platform, str) self.assertIsInstance(sys.prefix, str) - self.assertIsInstance(sys.base_prefix, str) self.assertIsInstance(sys.version, str) vi = sys.version_info self.assertIsInstance(vi[:], tuple) @@ -543,8 +541,6 @@ out = p.communicate()[0].strip() self.assertEqual(out, b'?') - @unittest.skipIf(sys.base_prefix != sys.prefix, - 'Test is not venv-compatible') def test_executable(self): # sys.executable should be absolute self.assertEqual(os.path.abspath(sys.executable), sys.executable) @@ -581,28 +577,6 @@ expected = None self.check_fsencoding(fs_encoding, expected) - def test_implementation(self): - # This test applies to all implementations equally. - - levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'release': 0xF} - - self.assertTrue(hasattr(sys.implementation, 'name')) - self.assertTrue(hasattr(sys.implementation, 'version')) - self.assertTrue(hasattr(sys.implementation, 'hexversion')) - self.assertTrue(hasattr(sys.implementation, 'cache_tag')) - - version = sys.implementation.version - self.assertEqual(version[:2], (version.major, version.minor)) - - hexversion = (version.major << 24 | version.minor << 16 | - version.micro << 8 | levels[version.releaselevel] << 4 | - version.serial << 0) - self.assertEqual(sys.implementation.hexversion, hexversion) - - # PEP 421 requires that .name be lower case. - self.assertEqual(sys.implementation.name, - sys.implementation.name.lower()) - class SizeofTest(unittest.TestCase): @@ -800,7 +774,7 @@ check(int(PyLong_BASE**2-1), size(vh) + 2*self.longdigit) check(int(PyLong_BASE**2), size(vh) + 3*self.longdigit) # memoryview - check(memoryview(b''), size(h + 'PPiP4P2i5P3c2P')) + check(memoryview(b''), size(h + 'PPiP4P2i5P3cP')) # module check(unittest, size(h + '3P')) # None