Python: Autoformat a few final stragglers.

tausbn · tausbn · commit 727cde31c99d · 2020-03-30T12:30:14.000+02:00
diff --git a/python/ql/src/semmle/python/dataflow/Implementation.qll b/python/ql/src/semmle/python/dataflow/Implementation.qll
@@ -963,11 +963,12 @@ private TaintKind taint_at_depth(SequenceKind parent_kind, int depth) {
         or
         // recursive case
         depth > 1 and
-        result = taint_at_depth(parent_kind.getMember(), depth-1)
+        result = taint_at_depth(parent_kind.getMember(), depth - 1)
     )
 }
 
-/** Helper predicate for taintedMultiAssignment
+/**
+ * Helper predicate for taintedMultiAssignment
  *
  * Returns the `depth` the elements that are assigned to `left_defn` with iterable unpacking has,
  * compared to `left_parent`. Special care is taken for `StarredNode` that is assigned a sequence of items.
@@ -982,9 +983,7 @@ int iterable_unpacking_descent(SequenceNode left_parent, ControlFlowNode left_de
     exists(Assign a | a.getATarget().getASubExpression*().getAFlowNode() = left_parent) and
     left_parent.getAnElement() = left_defn and
     // Handle `a, *b = some_iterable`
-    if left_defn instanceof StarredNode
-    then result = 0
-    else result = 1
+    if left_defn instanceof StarredNode then result = 0 else result = 1
     or
     result = 1 + iterable_unpacking_descent(left_parent.getAnElement(), left_defn)
 }
diff --git a/python/ql/src/semmle/python/web/django/General.qll b/python/ql/src/semmle/python/web/django/General.qll
@@ -27,11 +27,8 @@ abstract class DjangoRoute extends CallNode {
  * https://docs.djangoproject.com/en/3.0/topics/http/views/
  */
 class DjangoViewHandler extends PythonFunctionValue {
-
     /** Gets the index of the 'request' argument */
-    int getRequestArgIndex() {
-        result = 0
-    }
+    int getRequestArgIndex() { result = 0 }
 }
 
 /**
@@ -48,11 +45,7 @@ private class DjangoViewClass extends ClassValue {
 }
 
 class DjangoClassBasedViewHandler extends DjangoViewHandler {
-    DjangoClassBasedViewHandler() {
-        exists(DjangoViewClass cls |
-            cls.lookup(httpVerbLower()) = this
-        )
-    }
+    DjangoClassBasedViewHandler() { exists(DjangoViewClass cls | cls.lookup(httpVerbLower()) = this) }
 
     override int getRequestArgIndex() {
         // due to `self` being the first parameter
diff --git a/python/ql/src/semmle/python/web/django/Redirect.qll b/python/ql/src/semmle/python/web/django/Redirect.qll
@@ -16,7 +16,5 @@ private import semmle.python.web.Http
 class DjangoRedirect extends HttpRedirectTaintSink {
     override string toString() { result = "django.redirect" }
 
-    DjangoRedirect() {
-        this = redirect().getACall().getAnArg()
-    }
+    DjangoRedirect() { this = redirect().getACall().getAnArg() }
 }
diff --git a/python/ql/src/site.qll b/python/ql/src/site.qll
@@ -1,7 +1,7 @@
-/** Site library
- * 
+
+/*
+ * Site library
+ *
  * Include predicates and classes here, if they are required to customize all analysis.
- * 
  */
 
-

Original file line number	Diff line number	Diff line change
`@@ -963,11 +963,12 @@ private TaintKind taint_at_depth(SequenceKind parent_kind, int depth) {`
`963`	`963`	`or`
`964`	`964`	`// recursive case`
`965`	`965`	`depth > 1 and`
`966`		`- result = taint_at_depth(parent_kind.getMember(), depth-1)`
	`966`	`+ result = taint_at_depth(parent_kind.getMember(), depth - 1)`
`967`	`967`	`)`
`968`	`968`	`}`
`969`	`969`
`970`		`-/** Helper predicate for taintedMultiAssignment`
	`970`	`+/**`
	`971`	`+ * Helper predicate for taintedMultiAssignment`
`971`	`972`	`*`
`972`	`973`	* Returns the `depth` the elements that are assigned to `left_defn` with iterable unpacking has,
`973`	`974`	* compared to `left_parent`. Special care is taken for `StarredNode` that is assigned a sequence of items.
`@@ -982,9 +983,7 @@ int iterable_unpacking_descent(SequenceNode left_parent, ControlFlowNode left_de`
`982`	`983`	`exists(Assign a \| a.getATarget().getASubExpression*().getAFlowNode() = left_parent) and`
`983`	`984`	`left_parent.getAnElement() = left_defn and`
`984`	`985`	// Handle `a, *b = some_iterable`
`985`		`- if left_defn instanceof StarredNode`
`986`		`- then result = 0`
`987`		`- else result = 1`
	`986`	`+ if left_defn instanceof StarredNode then result = 0 else result = 1`
`988`	`987`	`or`
`989`	`988`	`result = 1 + iterable_unpacking_descent(left_parent.getAnElement(), left_defn)`
`990`	`989`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,5 @@ private import semmle.python.web.Http`
`16`	`16`	`class DjangoRedirect extends HttpRedirectTaintSink {`
`17`	`17`	`override string toString() { result = "django.redirect" }`
`18`	`18`
`19`		`- DjangoRedirect() {`
`20`		`- this = redirect().getACall().getAnArg()`
`21`		`- }`
	`19`	`+ DjangoRedirect() { this = redirect().getACall().getAnArg() }`
`22`	`20`	`}`