Put six.moves modules in sys.modules so that they're importable (fixes

#19)

2 files changed, 5 insertions, 1 deletions

diff --git a/six.py b/six.py
index 85898ec..f622c20 100644
--- a/six.py
+++ b/six.py
@@ -193,6 +193,8 @@ _moved_attributes = [
 ]
 for attr in _moved_attributes:
     setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        sys.modules[__name__ + ".moves." + attr.name] = attr
 del attr
 
 moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
diff --git a/test_six.py b/test_six.py
index 81d1776..b2ffe84 100644
--- a/test_six.py
+++ b/test_six.py
@@ -89,7 +89,9 @@ else:
 def test_move_items(item_name):
     """Ensure that everything loads correctly."""
     try:
-        getattr(six.moves, item_name)
+        item = getattr(six.moves, item_name)
+        if isinstance(item, types.ModuleType):
+            __import__("six.moves." + item_name)
     except AttributeError:
         if item_name == "zip_longest" and sys.version_info < (2, 6):
             py.test.skip("zip_longest only available on 2.6+")