[pypy-commit] pypy py3k: revert 54d5f5238df9 and import latin_1 additionally as cpython does guarantee

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r61869:9047e5093a5f
Date: 2013-02-27 13:58 -0800
http://bitbucket.org/pypy/pypy/changeset/9047e5093a5f/

Log:	revert 54d5f5238df9 and import latin_1 additionally as cpython does
	guarantee these have already been imported at startup

diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -1095,6 +1095,13 @@
             (mydir):
                 import sys
                 sys.path.append(mydir)
+
+                # Obscure: manually bootstrap the utf-8/latin1 codecs
+                # for TextIOs opened by imp.find_module. It's not
+                # otherwise loaded by the test infrastructure but would
+                # have been by app_main
+                import encodings.utf_8
+                import encodings.latin_1
         """)
 
     def teardown_class(cls):