[GR-10407] fix cell var registration for local imports

PullRequest: graalpython/82

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/python_unittests.py

@@ -39,14 +39,14 @@
 import os
 import re
 import subprocess
+import sys
 from collections import defaultdict
 from json import dumps
 from multiprocessing import Pool
 from pprint import pformat
+from time import gmtime, strftime
 
 import argparse
-import sys
-from time import gmtime, strftime
 
 # global CLI flags
 flags = None
@@ -522,7 +522,7 @@ def format_val(row, k):
         '''
 
     missing_modules_info = ul('missing modules', [
-        '<b>{}</b>&nbsp;<span class="text-muted">count: {}</span>'.format(name, cnt)
+        '<b>{}</b>&nbsp;<span class="text-muted">imported by {} unittests</span>'.format(name, cnt)
         for cnt, name in sorted(((cnt, name) for name, cnt in missing_modules.items()), reverse=True)
     ])
 

graalpython/com.oracle.graal.python.test/src/tests/test_scope.py

@@ -812,3 +812,18 @@ def method(self):
     assert not done
     a.method()
     assert done
+
+
+def test_import_name():
+    from os import environ
+
+    def func_1(a):
+        def func_2(x=environ):
+            x['my-key'] = a
+            return x
+        return func_2()
+
+    val = func_1('test-val')
+    assert 'my-key' in val
+    assert val['my-key'] == 'test-val'
+    del environ['my-key']

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeTranslator.java

@@ -180,9 +180,11 @@ public T visitLambdef_body(Python3Parser.Lambdef_bodyContext ctx) {
     public T visitImport_as_name(Python3Parser.Import_as_nameContext ctx) {
         List<TerminalNode> name = ctx.NAME();
         if (name.size() == 1) {
-            environment.createLocal(name.get(0).getText());
+            String asName = name.get(0).getText();
+            environment.createLocal(asName);
         } else if (name.size() == 2) {
-            environment.createLocal(name.get(1).getText());
+            String asName = name.get(1).getText();
+            environment.createLocal(asName);
         } else {
             throw new RuntimeException("Impossible case");
         }
@@ -369,7 +371,6 @@ public T visitDefparameter(Python3Parser.DefparameterContext ctx) {
             if (ctx.test() != null) {
                 String identifier = ctx.test().getText();
                 environment.registerCellVariable(identifier);
-                return null;
             }
         }
         return super.visitDefparameter(ctx);