Merge pull request #350 from toshok/relative-imports

add support for relative imports, and bring our import api closer to cpython

src/core/cfg.cpp

@@ -1279,7 +1279,16 @@ public:
 
             import->args.push_back(new AST_Num());
             static_cast<AST_Num*>(import->args[0])->num_type = AST_Num::INT;
-            static_cast<AST_Num*>(import->args[0])->n_int = -1;
+
+            // level == 0 means only check sys path for imports, nothing package-relative,
+            // level == -1 means check both sys path and relative for imports.
+            // so if `from __future__ import absolute_import` was used in the file, set level to 0
+            int level;
+            if (!(future_flags & FF_ABSOLUTE_IMPORT))
+                level = -1;
+            else
+                level = 0;
+            static_cast<AST_Num*>(import->args[0])->n_int = level;
             import->args.push_back(new AST_LangPrimitive(AST_LangPrimitive::NONE));
             import->args.push_back(new AST_Str(a->name.str()));
 
@@ -1316,8 +1325,6 @@ public:
     }
 
     bool visit_importfrom(AST_ImportFrom* node) override {
-        RELEASE_ASSERT(node->level == 0, "");
-
         AST_LangPrimitive* import = new AST_LangPrimitive(AST_LangPrimitive::IMPORT_NAME);
         import->lineno = node->lineno;
         import->col_offset = node->col_offset;
@@ -1325,7 +1332,9 @@ public:
         import->args.push_back(new AST_Num());
         static_cast<AST_Num*>(import->args[0])->num_type = AST_Num::INT;
 
-        // I don't quite understand this but this is what CPython does:
+        // level == 0 means only check sys path for imports, nothing package-relative,
+        // level == -1 means check both sys path and relative for imports.
+        // so if `from __future__ import absolute_import` was used in the file, set level to 0
         int level;
         if (node->level == 0 && !(future_flags & FF_ABSOLUTE_IMPORT))
             level = -1;

src/runtime/builtin_modules/builtins.cpp

@@ -472,9 +472,6 @@ Box* bltinImport(Box* name, Box* globals, Box* locals, Box** args) {
     Box* fromlist = args[0];
     Box* level = args[1];
 
-    RELEASE_ASSERT(globals == None, "not implemented");
-    RELEASE_ASSERT(locals == None, "not implemented");
-
     if (name->cls != str_cls) {
         raiseExcHelper(TypeError, "__import__() argument 1 must be string, not %s", getTypeName(name));
     }
@@ -483,7 +480,7 @@ Box* bltinImport(Box* name, Box* globals, Box* locals, Box** args) {
         raiseExcHelper(TypeError, "an integer is required");
     }
 
-    return import(((BoxedInt*)level)->n, fromlist, &static_cast<BoxedString*>(name)->s);
+    return importModuleLevel(&static_cast<BoxedString*>(name)->s, globals, fromlist, ((BoxedInt*)level)->n);
 }
 
 Box* delattrFunc(Box* obj, Box* _str) {

src/runtime/capi.cpp

@@ -838,7 +838,7 @@ extern "C" PyObject* PyImport_Import(PyObject* module_name) noexcept {
     RELEASE_ASSERT(module_name->cls == str_cls, "");
 
     try {
-        return import(-1, None, &static_cast<BoxedString*>(module_name)->s);
+        return importModuleLevel(&static_cast<BoxedString*>(module_name)->s, None, None, -1);
     } catch (ExcInfo e) {
         Py_FatalError("unimplemented");
     }

src/runtime/import.h

@@ -20,6 +20,7 @@
 namespace pyston {
 
 extern "C" Box* import(int level, Box* from_imports, const std::string* module_name);
+extern Box* importModuleLevel(std::string* module_name, Box* globals, Box* from_imports, int level);
 }
 
 #endif

test/tests/name_mangling.py

@@ -82,9 +82,7 @@ class MyClass(object):
         # Except if it's a dotted name:
         import __foo.__bar
     except ImportError, e:
-        # CPython says "no module named __foo.__bar__" but Pyston (and PyPy) say "no module named __foo".
-        # Canonicalize it slightly:
-        print e.message.split('.')[0]
+        print e.message
 
 # names inside classes with mangled names don't get the mangled class name:
 class MyClass(object):

test/tests/package_import_in_nonpackage.py

-# expected: fail
-# - crashes rather than throws an error
-
 try:
     from . import doesnt_exist
-except ImportError, e:
+except ValueError, e:
     print e

test/tests/package_test.py

-# expected: fail
-# - packages not supported
-# - intra-package imports ("from . import foo") not supported
-# - "from __future__ import absolute_import" not supported
+import os
 
 import test_package
-print test_package
+print 1, test_package.__name__, os.path.normpath(test_package.__file__)
 
 import test_package.intrapackage_import
 import test_package.absolute_import

test/tests/relative_import1.py

+import relative_import1_pkg

test/tests/relative_import1_pkg/__init__.py

+# Import names from pkg.string
+from .string import name1, name2
+# Import pkg.string
+#from . import string

test/tests/relative_import1_pkg/string.py

+print "string.py"
+
+def name1():
+    pass
+
+def name2():
+    pass

test/tests/relative_import2.py

+from relative_import2_pkg import foo

test/tests/relative_import2_pkg/__init__.py

+print "hello"

test/tests/relative_import2_pkg/foo.py

+print "more?"

test/tests/relative_import3.py

+import relative_import3_pkg

test/tests/relative_import3_pkg/A/__init__.py

+print "A.__init__"

test/tests/relative_import3_pkg/A/stuff.py

+print "A.stuff"
+
+all = [ 'func1' ]
+
+def func1():
+    pass

test/tests/relative_import3_pkg/B/__init__.py

+print "B.__init__"

test/tests/relative_import3_pkg/B/name2.py

+print "B.name2"

test/tests/relative_import3_pkg/C.py

+
+print "C.py"
+
+all = ['name1']
+
+def name1():
+    pass

test/tests/relative_import3_pkg/C/__init__.py

+print "C.__init__"

test/tests/relative_import3_pkg/C/name1.py

+
+#from . import name3
+#from ..B import name2
+
+print "C.name1.py"

test/tests/relative_import3_pkg/C/name3.py

+print "C.name3.py"

test/tests/relative_import3_pkg/__init__.py

+print "relative_import3_package.__init__"
+from A.stuff import func1
+from C import name1

test/tests/relative_import4.py

+import relative_import4_pkg

test/tests/relative_import4_pkg/__init__.py

+import re
+
+print type(re.compile)

test/tests/test_package/absolute_import.py

+import os
 import import_target
 
-print import_target
+print 3, import_target.__name__, os.path.normpath(import_target.__file__)

test/tests/test_package/absolute_import_with_future.py

 from __future__ import absolute_import
+import os
 import import_target
 
-print import_target
+print 4, import_target.__name__, os.path.normpath(import_target.__file__)

test/tests/test_package/intrapackage_import.py

+import os
 from . import import_target
-print import_target
+print 2, import_target.__name__, os.path.normpath(import_target.__file__)