Merged revisions 64326 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64326 | robert.schuppenies | 2008-06-17 03:42:15 -0500 (Tue, 17 Jun 2008) | 2 lines

  Issue 3048: Fixed sys.sizeof test fails with wide unicode.
........

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 6f1cf33605374f960b8f13479c3ff4a47468ad2e..404980296938f7d5fc4f338b9be7a0eea34c7b0a 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -495,8 +495,7 @@ class SizeofTest(unittest.TestCase):
         self.check_sizeof([], h + l + p + l)
         self.check_sizeof([1, 2, 3], h + l + p + l + 3*l)
         # unicode
-        import math
-        usize = math.log(sys.maxunicode + 1, 2) / 8
+        usize = len('\0'.encode('unicode-internal'))
         samples = ['', '1'*100]
         # we need to test for both sizes, because we don't know if the string
         # has been cached