[pypy-svn] r5531 - in pypy/trunk/src/pypy/module: . test test/impsubdir/pkg_substituted test/impsubdir/pkg_substituting

[pedronis at codespeak.net]

Author: pedronis
Date: Sun Jul 11 21:55:37 2004
New Revision: 5531

Added:
   pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/
   pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/__init__.py
   pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/mod.py
   pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituting/
   pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituting/__init__.py
Modified:
   pypy/trunk/src/pypy/module/__builtin__interp.py
   pypy/trunk/src/pypy/module/test/test_import.py
Log:
implementing substituing import support, with test


Modified: pypy/trunk/src/pypy/module/__builtin__interp.py
==============================================================================
--- pypy/trunk/src/pypy/module/__builtin__interp.py	(original)
+++ pypy/trunk/src/pypy/module/__builtin__interp.py	Sun Jul 11 21:55:37 2004
@@ -42,7 +42,8 @@
             space.setattr(w_mod, w('__path__'), space.newlist([w(pkgdir)]))
         w_dict = space.getattr(w_mod, w('__dict__'))
         execfile(w(f), w_dict, w_dict)
-        if w_parent is not None:
+        w_mod = check_sys_modules(w_modulename)
+        if w_mod is not None and w_parent is not None:
             space.setattr(w_parent, w_name, w_mod)
         return w_mod
     else:

Added: pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/__init__.py
==============================================================================
--- (empty file)
+++ pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/__init__.py	Sun Jul 11 21:55:37 2004
@@ -0,0 +1 @@
+# __init__

Added: pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituted/mod.py
==============================================================================

Added: pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituting/__init__.py
==============================================================================
--- (empty file)
+++ pypy/trunk/src/pypy/module/test/impsubdir/pkg_substituting/__init__.py	Sun Jul 11 21:55:37 2004
@@ -0,0 +1,2 @@
+import sys, pkg_substituted
+sys.modules[__name__] = pkg_substituted

Modified: pypy/trunk/src/pypy/module/test/test_import.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_import.py	(original)
+++ pypy/trunk/src/pypy/module/test/test_import.py	Sun Jul 11 21:55:37 2004
@@ -141,6 +141,9 @@
         #self.assertEquals(sys.modules.get('pkg.x'),None)
         #self.assert_('pkg.x.y' not in sys.modules)
         
+    def test_substituting_import(self):
+        from pkg_substituting import mod
+        self.assertEquals(mod.__name__,'pkg_substituting.mod')
         
         
 if __name__ == '__main__':