[Python-checkins] cpython: Use eval instead of codecs.lookup to trigger UTF-8 generation.

[martin.v.loewis]

http://hg.python.org/cpython/rev/6d2d45ab084d
changeset:   72478:6d2d45ab084d
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Wed Sep 28 09:15:11 2011 +0200
summary:
  Use eval instead of codecs.lookup to trigger UTF-8 generation.

files:
  Lib/test/test_sys.py |  10 ++++------
  1 files changed, 4 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -857,12 +857,10 @@
         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

-- 
Repository URL: http://hg.python.org/cpython