Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r60802:998e471748b9
Date: 2013-01-31 17:53 -0800
http://bitbucket.org/pypy/pypy/changeset/998e471748b9/

Log:    silly import test fixes

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
@@ -422,7 +422,7 @@
         def imp():
             import pkg.i_am_not_here.neither_am_i
         exc = raises(ImportError, imp)
-        assert exc.value.args[0] == "No module named 
i_am_not_here.neither_am_i"
+        assert exc.value.args[0] == "No module named pkg.i_am_not_here"
 
     def test_future_relative_import_level_1(self):
         from pkg import relative_c
@@ -1094,6 +1094,12 @@
             (mydir):
                 import sys
                 sys.path.append(mydir)
+
+                # Obscure: manually bootstrap the utf-8 codec for
+                # TextIOs opened by imp.find_module. It's not otherwise
+                # loaded by the test infrastructure but would have been
+                # in any other situation
+                import encodings.utf_8
         """)
 
     def teardown_class(cls):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to