[pypy-svn] r70069 - pypy/branch/import-builtin/pypy/module/imp

[afa at codespeak.net]

Author: afa
Date: Fri Dec 11 14:37:51 2009
New Revision: 70069

Modified:
   pypy/branch/import-builtin/pypy/module/imp/__init__.py
   pypy/branch/import-builtin/pypy/module/imp/importing.py
Log:
fixes for python test suite


Modified: pypy/branch/import-builtin/pypy/module/imp/__init__.py
==============================================================================
--- pypy/branch/import-builtin/pypy/module/imp/__init__.py	(original)
+++ pypy/branch/import-builtin/pypy/module/imp/__init__.py	Fri Dec 11 14:37:51 2009
@@ -12,7 +12,7 @@
         'C_BUILTIN':       'space.wrap(importing.C_BUILTIN)',
         'get_suffixes':    'interp_imp.get_suffixes',
 
-        #'get_magic':       'interp_imp.get_magic',
+        'get_magic':       'interp_imp.get_magic',
         'find_module':     'interp_imp.find_module',
         'load_module':     'interp_imp.load_module',
         'load_source':     'interp_imp.load_source',

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	Fri Dec 11 14:37:51 2009
@@ -419,7 +419,6 @@
     subname = namepath[-1]
     parent_name = '.'.join(namepath[:-1])
     parent = None
-    w_path = None
     if parent_name:
         w_parent = check_sys_modules(space, space.wrap(parent_name))
         if w_parent is None:
@@ -428,6 +427,8 @@
                 space.wrap("reload(): parent %s not in sys.modules" % (
                     parent_name,)))
         w_path = space.getitem(w_parent, space.wrap("__path"))
+    else:
+        w_path = space.sys.get('path')
 
     find_info = find_module(
         space, modulename, w_modulename, subname, w_path)