[pypy-svn] r45427 - in pypy/dist/pypy/module/__builtin__: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Jul 29 14:00:08 2007
New Revision: 45427

Modified:
   pypy/dist/pypy/module/__builtin__/importing.py
   pypy/dist/pypy/module/__builtin__/test/test_import.py
Log:
issue317 resolved

Raise ValueError on __import__(""). Deleted some strange (probably very old)
code.


Modified: pypy/dist/pypy/module/__builtin__/importing.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/importing.py	(original)
+++ pypy/dist/pypy/module/__builtin__/importing.py	Sun Jul 29 14:00:08 2007
@@ -146,13 +146,10 @@
 
 def importhook(space, modulename, w_globals=None,
                w_locals=None, w_fromlist=None):
-    if not isinstance(modulename, str):
-        try:
-            helper = ', not ' + modulename.__class__.__name__
-        except AttributeError:
-            helper = ''
-        raise OperationError(space.w_TypeError,
-              space.wrap("__import__() argument 1 must be string" + helper))
+    if not modulename:
+        raise OperationError(
+            space.w_ValueError,
+            space.wrap("Empty module name"))
     w = space.wrap
 
     ctxt_name = None

Modified: pypy/dist/pypy/module/__builtin__/test/test_import.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/test/test_import.py	(original)
+++ pypy/dist/pypy/module/__builtin__/test/test_import.py	Sun Jul 29 14:00:08 2007
@@ -248,6 +248,9 @@
         finally:
             os.chmod(p, 0775)
 
+    def test__import__empty_string(self):
+        raises(ValueError, __import__, "")
+
     def test_invalid__name__(self):
         glob = {}
         exec "__name__ = None; import sys" in glob