From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2008 12:44:04 +0000 (+0000)
Subject: Merged revisions 64326 via svnmerge from
X-Git-Tag: v3.0b1~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b49d994d007c43853b265d6626c7cf346deb46fb;p=thirdparty%2FPython%2Fcpython.git

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 6f1cf3360537..404980296938 100644
--- 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