[pypy-svn] r78942 - in pypy/branch/fast-forward/pypy/module/imp: . test

[afa at codespeak.net]

Author: afa
Date: Tue Nov  9 22:18:15 2010
New Revision: 78942

Modified:
   pypy/branch/fast-forward/pypy/module/imp/importing.py
   pypy/branch/fast-forward/pypy/module/imp/test/test_import.py
Log:
__import__ keyword arguments


Modified: pypy/branch/fast-forward/pypy/module/imp/importing.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/imp/importing.py	(original)
+++ pypy/branch/fast-forward/pypy/module/imp/importing.py	Tue Nov  9 22:18:15 2010
@@ -91,8 +91,9 @@
 def check_sys_modules_w(space, modulename):
     return space.finditem_str(space.sys.get('modules'), modulename)
 
-def importhook(space, modulename, w_globals=None,
+def importhook(space, name, w_globals=None,
                w_locals=None, w_fromlist=None, level=-1):
+    modulename = name
     space.timer.start_name("importhook", modulename)
     if not modulename and level < 0: 
         raise OperationError(

Modified: pypy/branch/fast-forward/pypy/module/imp/test/test_import.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/imp/test/test_import.py	(original)
+++ pypy/branch/fast-forward/pypy/module/imp/test/test_import.py	Tue Nov  9 22:18:15 2010
@@ -186,6 +186,9 @@
         assert pkg == sys.modules.get('pkg')
         assert pkg.a == sys.modules.get('pkg.a')
 
+    def test_import_keywords(self):
+        __import__(name='sys', level=0)
+
     def test_import_badcase(self):
         def missing(name):
             try: