Fix import star with members starting with underscore

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/package/moduleA.py

@@ -40,3 +40,6 @@
 """MODULE A DOC"""
 
 print("module A")
+
+publicProperty = 1
+_privateProperty = 2

graalpython/com.oracle.graal.python.test/src/tests/package/moduleY.py

@@ -41,3 +41,8 @@
 import math
 print("cos(100) = "+str(math.cos(100)))
 from .subpackage1 import moduleX
+
+__all__ = ['publicProperty', '_privateProperty']
+publicProperty = 1
+_privateProperty = 2
+unlistedProperty = 3

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

@@ -93,6 +93,21 @@ def test_import_star_has_to_be_module():
         assert False
 
 
+def test_import_star_no_all():
+    g = {}
+    exec("from package.moduleA import *", g)
+    assert 'publicProperty' in g
+    assert '_privateProperty' not in g
+
+
+def test_import_star_all():
+    g = {}
+    exec("from package.moduleY import *", g)
+    assert 'publicProperty' in g
+    assert '_privateProperty' in g
+    assert 'unlistedProperty' not in g
+
+
 def test_import_as_local():
     from sys import path
     from sys import path as mypath

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/ImportStarNode.java

@@ -155,9 +155,11 @@ private void writeAttributeToLocals(VirtualFrame frame, Node inliningTarget, Tru
                     PyObjectSetItem dictWriteNode, PyObjectSetAttr setAttrNode) {
         try {
             TruffleString name = castToTruffleStringNode.execute(inliningTarget, attrName);
-            // skip attributes with leading '__' if there was no '__all__' attribute (see
-            // 'ceval.c: import_all_from')
-            if (fromAll || !isDunder(name, cpLenNode, cpAtIndexNode)) {
+            /*
+             * skip attributes with leading '_' if there was no '__all__' attribute (see 'ceval.c:
+             * import_all_from')
+             */
+            if (fromAll || !startsWithUnderscore(name, cpLenNode, cpAtIndexNode)) {
                 Object moduleAttr = getAttr.execute(frame, inliningTarget, importedModule, name);
                 writeAttribute(frame, inliningTarget, locals, name, moduleAttr, dictWriteNode, setAttrNode);
             }
@@ -167,8 +169,8 @@ private void writeAttributeToLocals(VirtualFrame frame, Node inliningTarget, Tru
         }
     }
 
-    private static boolean isDunder(TruffleString s, TruffleString.CodePointLengthNode cpLenNode, TruffleString.CodePointAtIndexNode cpAtIndexNode) {
-        return cpLenNode.execute(s, TS_ENCODING) >= 2 && cpAtIndexNode.execute(s, 0, TS_ENCODING) == '_' && cpAtIndexNode.execute(s, 1, TS_ENCODING) == '_';
+    private static boolean startsWithUnderscore(TruffleString s, TruffleString.CodePointLengthNode cpLenNode, TruffleString.CodePointAtIndexNode cpAtIndexNode) {
+        return cpLenNode.execute(s, TS_ENCODING) > 0 && cpAtIndexNode.execute(s, 0, TS_ENCODING) == '_';
     }
 
     public static ImportStarNode create() {