Python: Fixed most problems from last commit

That one line was an afterthought, and certainly did not work as
intended.

Author: RasmusWL

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

@@ -118,7 +118,6 @@ module ImportResolution {
         EssaFlow::defToFirstUse(firstDef, mid) and
         EssaFlow::useToNextUse*(mid, end) and
         not EssaFlow::useToNextUse(end, _) and
-        lastUseVar.getAUse() = end and
         val.asCfgNode() = end
       )
     )

python/ql/test/experimental/dataflow/typetracking_imports/tracked.expected

@@ -1,19 +0,0 @@
-| pkg/alias_only_direct.py:1:26:1:36 | Comment # $ tracked | Missing result:tracked= |
-| pkg/alias_problem.py:1:26:1:36 | Comment # $ tracked | Missing result:tracked= |
-| pkg/alias_problem_fixed.py:3:26:3:36 | Comment # $ tracked | Missing result:tracked= |
-| pkg/problem_absolute_import.py:1:29:1:39 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:2:30:2:40 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:3:16:3:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:9:36:9:46 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:10:16:10:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:16:42:16:52 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:17:16:17:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:23:33:23:43 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:24:16:24:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:30:40:30:50 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:31:16:31:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:37:49:37:59 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:38:16:38:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:43:47:43:57 | Comment # $ tracked | Missing result:tracked= |
-| pkg/use.py:44:16:44:26 | Comment # $ tracked | Missing result:tracked= |
-| pkg/works_absolute_import.py:2:29:2:39 | Comment # $ tracked | Missing result:tracked= |

python/ql/test/experimental/import-resolution/ModuleExport.expected

@@ -1,27 +1,33 @@
+| attr_clash.__init__ | __file__ | attr_clash/__init__.py:6:6:6:13 | ControlFlowNode for __file__ |
 | attr_clash.__init__ | __name__ | attr_clash/__init__.py:0:0:0:0 | GSSA Variable __name__ |
 | attr_clash.__init__ | __package__ | attr_clash/__init__.py:0:0:0:0 | GSSA Variable __package__ |
 | attr_clash.__init__ | clashing_attr | attr_clash/__init__.py:4:1:4:13 | GSSA Variable clashing_attr |
 | attr_clash.__init__ | enter | attr_clash/__init__.py:2:1:2:5 | ControlFlowNode for enter |
 | attr_clash.__init__ | exit | attr_clash/__init__.py:6:1:6:4 | ControlFlowNode for exit |
+| attr_clash.clashing_attr | __file__ | attr_clash/clashing_attr.py:4:6:4:13 | ControlFlowNode for __file__ |
 | attr_clash.clashing_attr | __name__ | attr_clash/clashing_attr.py:0:0:0:0 | GSSA Variable __name__ |
 | attr_clash.clashing_attr | __package__ | attr_clash/clashing_attr.py:0:0:0:0 | GSSA Variable __package__ |
 | attr_clash.clashing_attr | enter | attr_clash/clashing_attr.py:2:1:2:5 | ControlFlowNode for enter |
 | attr_clash.clashing_attr | exit | attr_clash/clashing_attr.py:4:1:4:4 | ControlFlowNode for exit |
+| attr_clash.non_clashing_submodule | __file__ | attr_clash/non_clashing_submodule.py:4:6:4:13 | ControlFlowNode for __file__ |
 | attr_clash.non_clashing_submodule | __name__ | attr_clash/non_clashing_submodule.py:0:0:0:0 | GSSA Variable __name__ |
 | attr_clash.non_clashing_submodule | __package__ | attr_clash/non_clashing_submodule.py:0:0:0:0 | GSSA Variable __package__ |
 | attr_clash.non_clashing_submodule | enter | attr_clash/non_clashing_submodule.py:2:1:2:5 | ControlFlowNode for enter |
 | attr_clash.non_clashing_submodule | exit | attr_clash/non_clashing_submodule.py:4:1:4:4 | ControlFlowNode for exit |
+| bar | __file__ | bar.py:6:6:6:13 | ControlFlowNode for __file__ |
 | bar | __name__ | bar.py:0:0:0:0 | GSSA Variable __name__ |
 | bar | __package__ | bar.py:0:0:0:0 | GSSA Variable __package__ |
 | bar | bar_attr | bar.py:4:1:4:8 | GSSA Variable bar_attr |
 | bar | enter | bar.py:2:1:2:5 | ControlFlowNode for enter |
 | bar | exit | bar.py:6:1:6:4 | ControlFlowNode for exit |
+| baz | __file__ | baz.py:6:6:6:13 | ControlFlowNode for __file__ |
 | baz | __name__ | baz.py:0:0:0:0 | GSSA Variable __name__ |
 | baz | __package__ | baz.py:0:0:0:0 | GSSA Variable __package__ |
 | baz | baz_attr | baz.py:4:1:4:8 | GSSA Variable baz_attr |
 | baz | enter | baz.py:2:1:2:5 | ControlFlowNode for enter |
 | baz | exit | baz.py:6:1:6:4 | ControlFlowNode for exit |
 | block_flow_check | SOURCE | block_flow_check.py:12:25:12:30 | ControlFlowNode for SOURCE |
+| block_flow_check | __file__ | block_flow_check.py:14:6:14:13 | ControlFlowNode for __file__ |
 | block_flow_check | __name__ | block_flow_check.py:0:0:0:0 | GSSA Variable __name__ |
 | block_flow_check | __package__ | block_flow_check.py:0:0:0:0 | GSSA Variable __package__ |
 | block_flow_check | check | block_flow_check.py:12:1:12:5 | ControlFlowNode for check |
@@ -30,6 +36,7 @@
 | block_flow_check | globals | block_flow_check.py:12:33:12:39 | ControlFlowNode for globals |
 | block_flow_check | object | block_flow_check.py:4:14:4:19 | ControlFlowNode for object |
 | block_flow_check | staticmethod | block_flow_check.py:0:0:0:0 | GSSA Variable staticmethod |
+| foo | __file__ | foo.py:14:6:14:13 | ControlFlowNode for __file__ |
 | foo | __name__ | foo.py:0:0:0:0 | GSSA Variable __name__ |
 | foo | __package__ | foo.py:0:0:0:0 | GSSA Variable __package__ |
 | foo | __private_foo_attr | foo.py:8:1:8:18 | GSSA Variable __private_foo_attr |
@@ -41,23 +48,28 @@
 | foo | foo_attr | foo.py:5:1:5:8 | GSSA Variable foo_attr |
 | foo | globals | foo.py:12:71:12:77 | ControlFlowNode for globals |
 | has_defined_all | __all__ | has_defined_all.py:7:1:7:7 | GSSA Variable __all__ |
+| has_defined_all | __file__ | has_defined_all.py:9:6:9:13 | ControlFlowNode for __file__ |
 | has_defined_all | __name__ | has_defined_all.py:0:0:0:0 | GSSA Variable __name__ |
 | has_defined_all | __package__ | has_defined_all.py:0:0:0:0 | GSSA Variable __package__ |
 | has_defined_all | all_defined_bar | has_defined_all.py:5:1:5:15 | GSSA Variable all_defined_bar |
 | has_defined_all | all_defined_foo | has_defined_all.py:4:1:4:15 | GSSA Variable all_defined_foo |
 | has_defined_all | enter | has_defined_all.py:2:1:2:5 | ControlFlowNode for enter |
 | has_defined_all | exit | has_defined_all.py:9:1:9:4 | ControlFlowNode for exit |
 | has_defined_all_copy | __all__ | has_defined_all_copy.py:9:1:9:7 | GSSA Variable __all__ |
+| has_defined_all_copy | __file__ | has_defined_all_copy.py:11:6:11:13 | ControlFlowNode for __file__ |
 | has_defined_all_copy | __name__ | has_defined_all_copy.py:0:0:0:0 | GSSA Variable __name__ |
 | has_defined_all_copy | __package__ | has_defined_all_copy.py:0:0:0:0 | GSSA Variable __package__ |
 | has_defined_all_copy | all_defined_bar_copy | has_defined_all_copy.py:7:1:7:20 | GSSA Variable all_defined_bar_copy |
 | has_defined_all_copy | all_defined_foo_copy | has_defined_all_copy.py:6:1:6:20 | GSSA Variable all_defined_foo_copy |
 | has_defined_all_copy | enter | has_defined_all_copy.py:4:1:4:5 | ControlFlowNode for enter |
 | has_defined_all_copy | exit | has_defined_all_copy.py:11:1:11:4 | ControlFlowNode for exit |
+| has_defined_all_indirection | __file__ | has_defined_all_indirection.py:6:6:6:13 | ControlFlowNode for __file__ |
 | has_defined_all_indirection | __name__ | has_defined_all_indirection.py:0:0:0:0 | GSSA Variable __name__ |
 | has_defined_all_indirection | __package__ | has_defined_all_indirection.py:0:0:0:0 | GSSA Variable __package__ |
 | has_defined_all_indirection | all_defined_foo_copy | has_defined_all_copy.py:6:1:6:20 | GSSA Variable all_defined_foo_copy |
+| has_defined_all_indirection | enter | has_defined_all_indirection.py:2:1:2:5 | ControlFlowNode for enter |
 | has_defined_all_indirection | exit | has_defined_all_indirection.py:6:1:6:4 | ControlFlowNode for exit |
+| if_then_else | __file__ | if_then_else.py:16:6:16:13 | ControlFlowNode for __file__ |
 | if_then_else | __name__ | if_then_else.py:0:0:0:0 | GSSA Variable __name__ |
 | if_then_else | __package__ | if_then_else.py:0:0:0:0 | GSSA Variable __package__ |
 | if_then_else | enter | if_then_else.py:2:1:2:5 | ControlFlowNode for enter |
@@ -68,6 +80,7 @@
 | if_then_else | if_then_else_defined | if_then_else.py:14:9:14:28 | GSSA Variable if_then_else_defined |
 | if_then_else_refined | SOURCE | if_then_else_refined.py:11:11:11:16 | ControlFlowNode for SOURCE |
 | if_then_else_refined | SOURCE | if_then_else_refined.py:13:11:13:16 | ControlFlowNode for SOURCE |
+| if_then_else_refined | __file__ | if_then_else_refined.py:19:6:19:13 | ControlFlowNode for __file__ |
 | if_then_else_refined | __name__ | if_then_else_refined.py:0:0:0:0 | GSSA Variable __name__ |
 | if_then_else_refined | __package__ | if_then_else_refined.py:0:0:0:0 | GSSA Variable __package__ |
 | if_then_else_refined | check | if_then_else_refined.py:17:1:17:5 | ControlFlowNode for check |
@@ -76,22 +89,26 @@
 | if_then_else_refined | exit | if_then_else_refined.py:19:1:19:4 | ControlFlowNode for exit |
 | if_then_else_refined | globals | if_then_else_refined.py:17:24:17:30 | ControlFlowNode for globals |
 | if_then_else_refined | src | if_then_else_refined.py:17:19:17:21 | ControlFlowNode for src |
+| namespace_package.namespace_module | __file__ | namespace_package/namespace_module.py:6:6:6:13 | ControlFlowNode for __file__ |
 | namespace_package.namespace_module | __name__ | namespace_package/namespace_module.py:0:0:0:0 | GSSA Variable __name__ |
 | namespace_package.namespace_module | __package__ | namespace_package/namespace_module.py:0:0:0:0 | GSSA Variable __package__ |
 | namespace_package.namespace_module | enter | namespace_package/namespace_module.py:2:1:2:5 | ControlFlowNode for enter |
 | namespace_package.namespace_module | exit | namespace_package/namespace_module.py:6:1:6:4 | ControlFlowNode for exit |
 | namespace_package.namespace_module | namespace_module_attr | namespace_package/namespace_module.py:4:1:4:21 | GSSA Variable namespace_module_attr |
+| package.__init__ | __file__ | package/__init__.py:7:6:7:13 | ControlFlowNode for __file__ |
 | package.__init__ | __name__ | package/__init__.py:0:0:0:0 | GSSA Variable __name__ |
 | package.__init__ | __package__ | package/__init__.py:0:0:0:0 | GSSA Variable __package__ |
 | package.__init__ | attr_used_in_subpackage | package/__init__.py:4:1:4:23 | GSSA Variable attr_used_in_subpackage |
 | package.__init__ | enter | package/__init__.py:2:1:2:5 | ControlFlowNode for enter |
 | package.__init__ | exit | package/__init__.py:7:1:7:4 | ControlFlowNode for exit |
 | package.__init__ | package_attr | package/__init__.py:5:1:5:12 | GSSA Variable package_attr |
+| package.subpackage2.__init__ | __file__ | package/subpackage2/__init__.py:6:6:6:13 | ControlFlowNode for __file__ |
 | package.subpackage2.__init__ | __name__ | package/subpackage2/__init__.py:0:0:0:0 | GSSA Variable __name__ |
 | package.subpackage2.__init__ | __package__ | package/subpackage2/__init__.py:0:0:0:0 | GSSA Variable __package__ |
 | package.subpackage2.__init__ | enter | package/subpackage2/__init__.py:2:1:2:5 | ControlFlowNode for enter |
 | package.subpackage2.__init__ | exit | package/subpackage2/__init__.py:6:1:6:4 | ControlFlowNode for exit |
 | package.subpackage2.__init__ | subpackage2_attr | package/subpackage2/__init__.py:4:1:4:16 | GSSA Variable subpackage2_attr |
+| package.subpackage.__init__ | __file__ | package/subpackage/__init__.py:14:6:14:13 | ControlFlowNode for __file__ |
 | package.subpackage.__init__ | __name__ | package/subpackage/__init__.py:0:0:0:0 | GSSA Variable __name__ |
 | package.subpackage.__init__ | __package__ | package/subpackage/__init__.py:0:0:0:0 | GSSA Variable __package__ |
 | package.subpackage.__init__ | check | package/subpackage/__init__.py:12:1:12:5 | ControlFlowNode for check |
@@ -104,27 +121,32 @@
 | package.subpackage.__init__ | irrelevant_attr | package/subpackage/__init__.py:11:24:11:38 | GSSA Variable irrelevant_attr |
 | package.subpackage.__init__ | submodule | package/subpackage/__init__.py:12:35:12:43 | ControlFlowNode for submodule |
 | package.subpackage.__init__ | subpackage_attr | package/subpackage/__init__.py:4:1:4:15 | GSSA Variable subpackage_attr |
+| package.subpackage.submodule | __file__ | package/subpackage/submodule.py:7:6:7:13 | ControlFlowNode for __file__ |
 | package.subpackage.submodule | __name__ | package/subpackage/submodule.py:0:0:0:0 | GSSA Variable __name__ |
 | package.subpackage.submodule | __package__ | package/subpackage/submodule.py:0:0:0:0 | GSSA Variable __package__ |
 | package.subpackage.submodule | enter | package/subpackage/submodule.py:2:1:2:5 | ControlFlowNode for enter |
 | package.subpackage.submodule | exit | package/subpackage/submodule.py:7:1:7:4 | ControlFlowNode for exit |
 | package.subpackage.submodule | irrelevant_attr | package/subpackage/submodule.py:5:1:5:15 | GSSA Variable irrelevant_attr |
 | package.subpackage.submodule | submodule_attr | package/subpackage/submodule.py:4:1:4:14 | GSSA Variable submodule_attr |
 | refined | SOURCE | refined.py:12:25:12:30 | ControlFlowNode for SOURCE |
+| refined | __file__ | refined.py:14:6:14:13 | ControlFlowNode for __file__ |
 | refined | __name__ | refined.py:0:0:0:0 | GSSA Variable __name__ |
 | refined | __package__ | refined.py:0:0:0:0 | GSSA Variable __package__ |
 | refined | check | refined.py:12:1:12:5 | ControlFlowNode for check |
 | refined | enter | refined.py:2:1:2:5 | ControlFlowNode for enter |
 | refined | exit | refined.py:14:1:14:4 | ControlFlowNode for exit |
 | refined | globals | refined.py:12:33:12:39 | ControlFlowNode for globals |
 | refined | object | refined.py:4:14:4:19 | ControlFlowNode for object |
+| simplistic_reexport | __file__ | simplistic_reexport.py:19:6:19:13 | ControlFlowNode for __file__ |
 | simplistic_reexport | __name__ | simplistic_reexport.py:0:0:0:0 | GSSA Variable __name__ |
 | simplistic_reexport | __package__ | simplistic_reexport.py:0:0:0:0 | GSSA Variable __package__ |
 | simplistic_reexport | bar_attr | simplistic_reexport.py:6:17:6:24 | ControlFlowNode for ImportMember |
+| simplistic_reexport | bar_attr | simplistic_reexport.py:10:19:10:26 | ControlFlowNode for bar_attr |
 | simplistic_reexport | baz_attr | baz.py:4:1:4:8 | GSSA Variable baz_attr |
 | simplistic_reexport | baz_attr | simplistic_reexport.py:17:19:17:26 | ControlFlowNode for baz_attr |
 | simplistic_reexport | check | simplistic_reexport.py:17:1:17:5 | ControlFlowNode for check |
 | simplistic_reexport | enter | baz.py:2:1:2:5 | ControlFlowNode for enter |
+| simplistic_reexport | enter | simplistic_reexport.py:4:1:4:5 | ControlFlowNode for enter |
 | simplistic_reexport | exit | baz.py:6:1:6:4 | ControlFlowNode for exit |
 | simplistic_reexport | exit | simplistic_reexport.py:19:1:19:4 | ControlFlowNode for exit |
 | simplistic_reexport | globals | simplistic_reexport.py:17:44:17:50 | ControlFlowNode for globals |

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

@@ -143,7 +143,7 @@ def local_import():
 check("if_then_else_refined.src", if_then_else_refined.src, if_then_else_refined.src, globals()) #$ prints=SOURCE
 
 import simplistic_reexport # $ imports=simplistic_reexport as=simplistic_reexport
-check("simplistic_reexport.bar_attr", simplistic_reexport.bar_attr, "overwritten", globals()) #$ MISSING: prints=overwritten SPURIOUS: prints=bar_attr
+check("simplistic_reexport.bar_attr", simplistic_reexport.bar_attr, "overwritten", globals()) #$ prints=overwritten SPURIOUS: prints=bar_attr
 check("simplistic_reexport.baz_attr", simplistic_reexport.baz_attr, "overwritten", globals()) #$ prints=overwritten SPURIOUS: prints=baz_attr
 
 # check that we don't treat all assignments as being exports