[pypy-commit] pypy py3.3: charming the null importer works missed the positional argument, fixed the test

plan_rich noreply at buildbot.pypy.org
Thu Nov 5 10:35:28 EST 2015


Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.3
Changeset: r80549:c5b84e7e1e4e
Date: 2015-11-05 16:30 +0100
http://bitbucket.org/pypy/pypy/changeset/c5b84e7e1e4e/

Log:	charming the null importer works missed the positional argument,
	fixed the test

diff --git a/lib-python/3/imp.py b/lib-python/3/imp.py
--- a/lib-python/3/imp.py
+++ b/lib-python/3/imp.py
@@ -73,7 +73,7 @@
         elif os.path.isdir(path):
             raise ImportError('existing directory', path=path)
 
-    def find_module(self, fullname):
+    def find_module(self, fullname, path=None):
         """Always returns None."""
         return None
 
diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -160,7 +160,7 @@
     def test_nullimporter(self):
         import os, imp
         importer = imp.NullImporter("path")
-        assert importer.find_module(1, 2, 3, 4) is None
+        assert importer.find_module(1, [2, 3, 4]) is None
         raises(ImportError, imp.NullImporter, os.getcwd())
 
     def test_path_importer_cache(self):


More information about the pypy-commit mailing list