Python: Autoformat rest of semmle/python.

Author: tausbn

python/ql/src/semmle/python/dataflow/Implementation.qll

@@ -57,8 +57,8 @@ private newtype TAttributePath =
      * It might make sense to add another level, attribute of attribute.
      * But some experimentation would be needed.
      */
-    TAttribute(string name) { exists(Attribute a | a.getName() = name) }
 
+    TAttribute(string name) { exists(Attribute a | a.getName() = name) }
 
 /**
  * The attribute of the tracked value holding the taint.
@@ -445,9 +445,8 @@ class TaintTrackingImplementation extends string {
             context = TNoParam() and
             src = TTaintTrackingNode_(retval, TNoParam(), path, kind, this) and
             node.asCfgNode() = call and
-            retval.asCfgNode() = any(Return ret | ret.getScope() = pyfunc.getScope())
-                        .getValue()
-                        .getAFlowNode()
+            retval.asCfgNode() =
+                any(Return ret | ret.getScope() = pyfunc.getScope()).getValue().getAFlowNode()
         ) and
         edgeLabel = "return"
     }
@@ -469,9 +468,8 @@ class TaintTrackingImplementation extends string {
             this.callContexts(call, src, pyfunc, context, callee) and
             retnode = TTaintTrackingNode_(retval, callee, path, kind, this) and
             node.asCfgNode() = call and
-            retval.asCfgNode() = any(Return ret | ret.getScope() = pyfunc.getScope())
-                        .getValue()
-                        .getAFlowNode()
+            retval.asCfgNode() =
+                any(Return ret | ret.getScope() = pyfunc.getScope()).getValue().getAFlowNode()
         ) and
         edgeLabel = "call"
     }
@@ -717,7 +715,8 @@ private class EssaTaintTracking extends string {
             path.noAttribute()
         |
             assign.getValue().getAFlowNode() = srcnode.asCfgNode() and
-            kind = iterable_unpacking_descent(assign.getATarget().getAFlowNode(), defn.getDefiningNode(),
+            kind =
+                iterable_unpacking_descent(assign.getATarget().getAFlowNode(), defn.getDefiningNode(),
                     srckind)
         )
     }
@@ -734,8 +733,8 @@ private class EssaTaintTracking extends string {
         then result = parent_kind
         else result = parent_kind.getMember()
         or
-        result = iterable_unpacking_descent(left_parent.getAnElement(), left_defn,
-                parent_kind.getMember())
+        result =
+            iterable_unpacking_descent(left_parent.getAnElement(), left_defn, parent_kind.getMember())
     }
 
     pragma[noinline]

python/ql/src/semmle/python/dependencies/Dependencies.qll

@@ -1,13 +1,14 @@
-
 import python
 import semmle.python.dependencies.DependencyKind
 
 private predicate importDependency(Object target, AstNode source) {
-    source.getScope() != target.getOrigin() and /* Imports of own module are ignored */
+    source.getScope() != target.getOrigin() and
+    /* Imports of own module are ignored */
     (
         exists(ModuleObject importee, ImportingStmt imp_stmt |
             source = imp_stmt and
-            importee = target |
+            importee = target
+        |
             exists(ImportMember im | imp_stmt.contains(im) |
                 importee.importedAs(im.getImportedModuleName())
             )
@@ -23,28 +24,22 @@ private predicate importDependency(Object target, AstNode source) {
         )
         or
         /* from m import name, where m.name is not a submodule */
-        exists(PythonModuleObject importee, ImportingStmt imp_stmt |
-            source = imp_stmt |
+        exists(PythonModuleObject importee, ImportingStmt imp_stmt | source = imp_stmt |
             exists(ImportMember im | imp_stmt.contains(im) |
-                importee.importedAs(im.getModule().(ImportExpr).getImportedModuleName())  
-                and
+                importee.importedAs(im.getModule().(ImportExpr).getImportedModuleName()) and
                 defn_of_module_attribute(target, importee.getModule(), im.getName())
             )
         )
     )
 }
 
 class PythonImport extends DependencyKind {
-
-    PythonImport() {
-         this = "import"
-    }
+    PythonImport() { this = "import" }
 
     override predicate isADependency(AstNode source, Object target) {
         this = this and
         importDependency(target, source)
     }
-
 }
 
 private predicate interesting(Object target) {
@@ -58,10 +53,7 @@ private predicate interesting(Object target) {
 }
 
 class PythonUse extends DependencyKind {
-
-    PythonUse() {
-         this = "use"
-    }
+    PythonUse() { this = "use" }
 
     override predicate isADependency(AstNode source, Object target) {
         interesting(target) and
@@ -71,58 +63,46 @@ class PythonUse extends DependencyKind {
             use.getNode() = source and
             use.refersTo(obj) and
             use.isLoad()
-            |
+        |
             interesting(obj) and target = obj
-        )
-        and
+        ) and
         not has_more_specific_dependency_source(source)
     }
-
 }
 
-/** Whether there is a more specific dependency source than this one. 
+/**
+ * Whether there is a more specific dependency source than this one.
  * E.g. if the expression pack.mod.func is a dependency on the function 'func' in 'pack.mod'
  * don't make pack.mod depend on the module 'pack.mod'
  */
 private predicate has_more_specific_dependency_source(Expr e) {
-    exists(Attribute member |
-        member.getObject() = e |
+    exists(Attribute member | member.getObject() = e |
         attribute_access_dependency(_, member)
         or
         has_more_specific_dependency_source(member)
     )
 }
 
 class PythonInheritance extends DependencyKind {
-
-    PythonInheritance() {
-        this = "inheritance"
-    }
+    PythonInheritance() { this = "inheritance" }
 
     override predicate isADependency(AstNode source, Object target) {
         this = this and
-        exists(ClassObject cls |
-            source = cls.getOrigin()
-            |
+        exists(ClassObject cls | source = cls.getOrigin() |
             target = cls.getASuperType()
             or
             target = cls.getAnInferredType()
         )
     }
-
 }
 
 class PythonAttribute extends DependencyKind {
-
-    PythonAttribute() {
-         this = "attribute"
-    }
+    PythonAttribute() { this = "attribute" }
 
     override predicate isADependency(AstNode source, Object target) {
         this = this and
         attribute_access_dependency(target, source)
     }
-
 }
 
 private predicate attribute_access_dependency(Object target, AstNode source) {
@@ -133,30 +113,23 @@ private predicate attribute_access_dependency(Object target, AstNode source) {
 }
 
 private predicate use_of_attribute(Attribute attr, Scope s, string name) {
-    exists(AttrNode cfg | 
-        cfg.isLoad() and cfg.getNode() = attr
-        |
-        exists(Object obj |
-            cfg.getObject(name).refersTo(obj) |
+    exists(AttrNode cfg | cfg.isLoad() and cfg.getNode() = attr |
+        exists(Object obj | cfg.getObject(name).refersTo(obj) |
             s = obj.(PythonModuleObject).getModule() or
             s = obj.(ClassObject).getPyClass()
-        ) or
-        exists(ClassObject cls |
-            cfg.getObject(name).refersTo(_, cls, _) |
-            s = cls.getPyClass()
         )
+        or
+        exists(ClassObject cls | cfg.getObject(name).refersTo(_, cls, _) | s = cls.getPyClass())
     )
     or
-    exists(SelfAttributeRead sar |
-        sar = attr |
+    exists(SelfAttributeRead sar | sar = attr |
         sar.getClass() = s and
         sar.getName() = name
     )
 }
 
 private predicate defn_of_attribute(Object target, Scope s, string name) {
-    exists(Assign asgn |
-        target.(ControlFlowNode).getNode() = asgn |
+    exists(Assign asgn | target.(ControlFlowNode).getNode() = asgn |
         defn_of_instance_attribute(asgn, s, name)
         or
         defn_of_class_attribute(asgn, s, name)
@@ -165,13 +138,14 @@ private predicate defn_of_attribute(Object target, Scope s, string name) {
     defn_of_module_attribute(target, s, name)
 }
 
-/* Whether asgn defines an instance attribute, that is does
+/*
+ * Whether asgn defines an instance attribute, that is does
  * asgn take the form  self.name  = ... where self is an instance
  * of class c and asgn is not a redefinition.
  */
+
 private predicate defn_of_instance_attribute(Assign asgn, Class c, string name) {
-    exists(SelfAttributeStore sas |
-        asgn.getATarget() = sas |
+    exists(SelfAttributeStore sas | asgn.getATarget() = sas |
         sas.getClass() = c and
         sas.getName() = name and
         not exists(SelfAttributeStore in_init |

python/ql/src/semmle/python/dependencies/DependencyKind.qll

@@ -3,7 +3,6 @@ import semmle.python.dependencies.Dependencies
 /**
  * A library describing an abstract mechanism for representing dependency categories.
  */
-
 /*
  * A DependencyCategory is a unique string key used by Architect to identify different categories
  * of dependencies that might be viewed independently.
@@ -12,20 +11,17 @@ import semmle.python.dependencies.Dependencies
  * accepted by Architect.
  * </p>
  */
-abstract class DependencyKind extends string {
 
+abstract class DependencyKind extends string {
     bindingset[this]
-    DependencyKind() {
-        this = this
-    }
+    DependencyKind() { this = this }
 
     /* Tech inventory interface */
     /**
-   * Identify dependencies associated with this category.
-   * <p>
-   * The source element is the source of the dependency.
-   * </p>
-   */
+     * Identify dependencies associated with this category.
+     * <p>
+     * The source element is the source of the dependency.
+     * </p>
+     */
     abstract predicate isADependency(AstNode source, Object target);
-
-}
+}