Python: fix inconsistencies

Author: yoff

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

@@ -460,15 +460,21 @@ module VariableCapture {
     }
 
     class ClosureExpr extends Expr {
-      ClosureExpr() { this.getNode() instanceof CallableExpr }
+      ClosureExpr() {
+        this.getNode() instanceof CallableExpr
+        or
+        this.getNode() instanceof Comp
+      }
 
-      predicate hasBody(Callable body) { body = this.getNode().(CallableExpr).getInnerScope() }
+      predicate hasBody(Callable body) {
+        body = this.getNode().(CallableExpr).getInnerScope()
+        or
+        body = this.getNode().(Comp).getFunction()
+      }
 
       predicate hasAliasedAccess(Expr f) { closureFlowStep+(this, f) and not closureFlowStep(f, _) }
     }
 
-    // TODO: Some basic blocks will not have an enclosing callable
-    // as their scope are not `Function`s. This leads to inconsistency failures.
     class Callable extends Scope {
       predicate isConstructor() { none() }
     }