From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 28 Sep 2011 07:15:11 +0000 (+0200)
Subject: Use eval instead of codecs.lookup to trigger UTF-8 generation.
X-Git-Tag: v3.3.0a1~1485
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c9fe4d109a94d1a923991d223ab60fbce8420f5;p=thirdparty%2FPython%2Fcpython.git

Use eval instead of codecs.lookup to trigger UTF-8 generation.
---

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index ed96d76c4f81..9554eefcb7f6 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -857,12 +857,10 @@ class SizeofTest(unittest.TestCase):
         s = chr(0x4000)   # 4 bytes canonical representation
         check(s, size(compactfields) + 4)
         try:
-            # FIXME: codecs.lookup(str) calls encoding.search_function() which
-            # calls __import__ using str in the module name. __import__ encodes
-            # the module name to the file system encoding (which is the locale
-            # encoding), so test_sys fails if the locale encoding is not UTF-8.
-            codecs.lookup(s) # produces 4 bytes UTF-8
-        except LookupError:
+            # eval() will trigger the generation of the UTF-8 representation
+            # as a side effect
+            eval(s)
+        except NameError:
             check(s, size(compactfields) + 4 + 4)
         # TODO: add check that forces the presence of wchar_t representation
         # TODO: add check that forces layout of unicodefields