[pypy-commit] pypy default: properly test/fix _io __modules__s

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r71310:13f0fb1ddec1
Date: 2014-05-05 22:20 -0400
http://bitbucket.org/pypy/pypy/changeset/13f0fb1ddec1/

Log:	properly test/fix _io __modules__s

diff --git a/pypy/module/_io/interp_io.py b/pypy/module/_io/interp_io.py
--- a/pypy/module/_io/interp_io.py
+++ b/pypy/module/_io/interp_io.py
@@ -27,7 +27,7 @@
         self.written = written
 
 W_BlockingIOError.typedef = TypeDef(
-    '_io.BlockingIOError', W_IOError.typedef,
+    'BlockingIOError', W_IOError.typedef,
     __doc__ = ("Exception raised when I/O would block on a non-blocking "
                "I/O stream"),
     __new__  = generic_new_descr(W_BlockingIOError),
diff --git a/pypy/module/_io/test/test_io.py b/pypy/module/_io/test/test_io.py
--- a/pypy/module/_io/test/test_io.py
+++ b/pypy/module/_io/test/test_io.py
@@ -345,4 +345,10 @@
         import _io
         typemods = dict((t, t.__module__) for t in vars(_io).values()
                         if isinstance(t, type))
-        assert all(mod in ('io', '_io') for mod in typemods.values()), typemods
+        for t, mod in typemods.items():
+            if t is _io.BlockingIOError:
+                assert mod == '__builtin__'
+            elif t is _io.UnsupportedOperation:
+                assert mod == 'io'
+            else:
+                assert mod == '_io'
diff --git a/pypy/module/_io/test/test_stringio.py b/pypy/module/_io/test/test_stringio.py
--- a/pypy/module/_io/test/test_stringio.py
+++ b/pypy/module/_io/test/test_stringio.py
@@ -146,11 +146,6 @@
         exc_info = raises(TypeError, sio.write, 3)
         assert "int" in exc_info.value.args[0]
 
-    def test_module(self):
-        import io
-
-        assert io.StringIO.__module__ == "_io"
-
     def test_newline_none(self):
         import io