[pypy-svn] r70119 - in pypy/branch/import-builtin/pypy/module/imp: . test

[afa at codespeak.net]

Author: afa
Date: Tue Dec 15 10:20:24 2009
New Revision: 70119

Modified:
   pypy/branch/import-builtin/pypy/module/imp/importing.py
   pypy/branch/import-builtin/pypy/module/imp/test/test_import.py
Log:
Test and fix for reload()


Modified: pypy/branch/import-builtin/pypy/module/imp/importing.py
==============================================================================
--- pypy/branch/import-builtin/pypy/module/imp/importing.py	(original)
+++ pypy/branch/import-builtin/pypy/module/imp/importing.py	Tue Dec 15 10:20:24 2009
@@ -428,7 +428,7 @@
                 space.w_ImportError,
                 space.wrap("reload(): parent %s not in sys.modules" % (
                     parent_name,)))
-        w_path = space.getitem(w_parent, space.wrap("__path__"))
+        w_path = space.getattr(w_parent, space.wrap("__path__"))
     else:
         w_path = None
 

Modified: pypy/branch/import-builtin/pypy/module/imp/test/test_import.py
==============================================================================
--- pypy/branch/import-builtin/pypy/module/imp/test/test_import.py	(original)
+++ pypy/branch/import-builtin/pypy/module/imp/test/test_import.py	Tue Dec 15 10:20:24 2009
@@ -412,6 +412,10 @@
         import os
         os.unlink(test_reload.__file__)
 
+    def test_reload_submodule(self):
+        import pkg.a
+        reload(pkg.a)
+
 def _getlong(data):
     x = marshal.dumps(data)
     return x[-4:]