Python: Fix import * from __init__.py files

Author: RasmusWL

python/ql/lib/semmle/python/dataflow/new/internal/ImportResolution.qll

@@ -167,8 +167,9 @@ module ImportResolution {
     )
   }
 
+  /** Gets the module from which attributes are imported by `i`. */
   Module getModuleImportedByImportStar(ImportStar i) {
-    isPreferredModuleForName(result.getFile(), i.getImportedModuleName())
+    isPreferredModuleForName(result.getFile(), i.getImportedModuleName() + ["", ".__init__"])
   }
 
   /**

python/ql/test/experimental/import-resolution/main.py

@@ -87,7 +87,7 @@ def local_import():
 
 # check that import * from an __init__ file works
 from package.subpackage2 import *
-check("subpackage2_attr", subpackage2_attr, "subpackage2_attr", globals()) #$ MISSING: prints=subpackage2_attr
+check("subpackage2_attr", subpackage2_attr, "subpackage2_attr", globals()) #$ prints=subpackage2_attr
 
 
 exit(__file__)