Merge pull request serge-sans-paille#1090 from serge-sans-paille/feature/rework-handle-import

Feature/rework handle import

Author: serge-sans-paille

pythran/analyses/argument_effects.py

@@ -163,6 +163,9 @@ def visit_Call(self, node):
                         func_alias = self.global_declarations[bound_name]
                     if func_alias is intrinsic.UnboundValue:
                         continue
+                    if func_alias not in self.node_to_functioneffect:
+                        continue
+
                     func_alias = self.node_to_functioneffect[func_alias]
                     predecessors = self.result.predecessors(func_alias)
                     if self.current_function not in predecessors:

pythran/analyses/argument_read_once.py

@@ -202,8 +202,13 @@ def visit_Call(self, node):
                     if isinstance(func_alias, ast.Call):
                         bound_name = func_alias.args[0].id
                         func_alias = self.global_declarations[bound_name]
+
                     if func_alias is intrinsic.UnboundValue:
                         continue
+
+                    if func_alias not in self.node_to_functioneffect:
+                        continue
+
                     func_alias = self.node_to_functioneffect[func_alias]
                     index_corres[n] = i
                     func = func_alias

pythran/passmanager.py

@@ -12,6 +12,7 @@
 """
 
 import gast as ast
+import os
 import re
 
 
@@ -185,7 +186,7 @@ class PassManager(object):
     '''
     def __init__(self, module_name, module_dir=None):
         self.module_name = module_name
-        self.module_dir = module_dir
+        self.module_dir = module_dir or os.getcwd()
         self._cache = {}
 
     def gather(self, analysis, node, ctx=None):

pythran/tests/test_distutils.py

@@ -22,9 +22,13 @@ def test_setup_build(self):
                    cwd=os.path.join(cwd, 'test_distutils'))
         check_call(['python', 'setup.py', 'install', '--prefix=demo_install'],
                    cwd=os.path.join(cwd, 'test_distutils'))
+
+        base = os.path.join(cwd, 'test_distutils', 'demo_install',)
+        libdir = os.path.join(base, 'lib')
+        if not os.path.isdir(libdir):
+            libdir = os.path.join(base, 'lib64')
         check_call(['python', '-c', 'import demo'],
-                   cwd=os.path.join(cwd, 'test_distutils', 'demo_install',
-                                    'lib', python_version, 'site-packages'))
+                   cwd=os.path.join(libdir, python_version, 'site-packages'))
         check_call(['python', 'setup.py', 'clean'],
                    cwd=os.path.join(cwd, 'test_distutils'))
         shutil.rmtree(os.path.join(cwd, 'test_distutils', 'demo_install'))
@@ -59,9 +63,13 @@ def test_setup_build2(self):
                    cwd=os.path.join(cwd, 'test_distutils_packaged'))
         check_call(['python', 'setup.py', 'install', '--prefix=demo_install2'],
                    cwd=os.path.join(cwd, 'test_distutils_packaged'))
+
+        base = os.path.join(cwd, 'test_distutils_packaged', 'demo_install2',)
+        libdir = os.path.join(base, 'lib')
+        if not os.path.isdir(libdir):
+            libdir = os.path.join(base, 'lib64')
         check_call(['python', '-c', 'import demo2.a'],
-                   cwd=os.path.join(cwd, 'test_distutils_packaged', 'demo_install2',
-                                    'lib', python_version, 'site-packages'))
+                   cwd=os.path.join(libdir, python_version, 'site-packages'))
         check_call(['python', 'setup.py', 'clean'],
                    cwd=os.path.join(cwd, 'test_distutils_packaged'))
         shutil.rmtree(os.path.join(cwd, 'test_distutils_packaged', 'demo_install2'))

pythran/tests/test_import_all.py

@@ -33,8 +33,7 @@ def unsupported_module():
         with self.assertRaises(pythran.syntax.PythranSyntaxError) as ex:
             pythran.compile_pythrancode("flamby", dedent(code))
 
-        self.assertIn("Module 'collections' unknown and not found.",
-                      str(ex.exception))
+        self.assertIn("Module 'collections' not found.", str(ex.exception))
 
     def test_complex_import_manipulation(self):
         """

pythran/tests/test_optimizations.py

@@ -468,3 +468,26 @@ def global_effects_unknown(a):
         self.run_test(code,
                       1,
                       global_effects_unknown=[int])
+
+    def test_argument_effects_unknown(self):
+        code = '''
+            def int_datatype(n):
+                return list, str, n
+
+            def list_datatype(parent):
+                def parser(value):
+                    return parent[0](value)
+
+                def formatter(value):
+                    return parent[1](value)
+
+                return parser, formatter
+
+
+            def argument_effects_unknown(n):
+                list_datatype(int_datatype(n))'''
+
+        self.run_test(code,
+                      1,
+                      argument_effects_unknown=[int])
+

pythran/tests/user_defined_import/builtins_in_imported.py

@@ -0,0 +1,2 @@
+def dint():
+    return int()

pythran/tests/user_defined_import/builtins_in_imported_main.py

@@ -0,0 +1,8 @@
+import builtins_in_imported
+from builtins_in_imported import dint
+
+
+#pythran export entry()
+#runas entry()
+def entry():
+    return dint(), builtins_in_imported.dint()

pythran/tests/user_defined_import/global_init.py

@@ -0,0 +1,2 @@
+def aa():
+    return 3.14

pythran/tests/user_defined_import/global_init_alias_main.py

@@ -0,0 +1,8 @@
+import global_init as gi
+
+
+XX = [gi.aa(), 3]
+
+#pythran export bb()
+def bb():
+    return XX