python: fix warnings

yoff · yoff · commit 30d3c3e8cde3 · 2023-05-09T15:01:31.000+02:00
- rename `Conf` -&gt; `Config`
- comment out unused code
- rearrange code so it is easy to see how to swap comments
- autoformat
diff --git a/python/ql/test/experimental/meta/debug/InlineTaintTestPaths.ql b/python/ql/test/experimental/meta/debug/InlineTaintTestPaths.ql
@@ -12,26 +12,24 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import experimental.meta.InlineTaintTest::Conf
 
-module Conf implements DataFlow::ConfigSig {
+module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    any (TestTaintTrackingConfiguration c).isSource(source)
+    any(TestTaintTrackingConfiguration c).isSource(source)
   }
-  predicate isSink(DataFlow::Node source) {
-    any (TestTaintTrackingConfiguration c).isSink(source)
-  }
-}
-int explorationLimit() { result = 5 }
 
-module Flows = TaintTracking::Global<Conf>;
+  predicate isSink(DataFlow::Node source) { any(TestTaintTrackingConfiguration c).isSink(source) }
+}
 
-module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
+module Flows = TaintTracking::Global<Config>;
 
-// import FlowsPartial::PartialPathGraph
 import Flows::PathGraph
 
-// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
-// where FlowsPartial::partialFlow(source, sink, _)
+// int explorationLimit() { result = 5 }
+// module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
+// import FlowsPartial::PartialPathGraph
 from Flows::PathNode source, Flows::PathNode sink
 where Flows::flowPath(source, sink)
+// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
+// where FlowsPartial::partialFlow(source, sink, _)
 select sink.getNode(), source, sink, "This node receives taint from $@.", source.getNode(),
   "this source"
diff --git a/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql b/python/ql/test/experimental/meta/debug/dataflowTestPaths.ql
@@ -11,24 +11,22 @@ import python
 import semmle.python.dataflow.new.DataFlow
 import experimental.dataflow.testConfig
 
-module Conf implements DataFlow::ConfigSig {
+module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { any(TestConfiguration c).isSource(source) }
 
   predicate isSink(DataFlow::Node source) { any(TestConfiguration c).isSink(source) }
 }
 
-int explorationLimit() { result = 5 }
+module Flows = DataFlow::Global<Config>;
 
-module Flows = DataFlow::Global<Conf>;
-
-module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
-
-// import FlowsPartial::PartialPathGraph
 import Flows::PathGraph
 
-// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
-// where FlowsPartial::partialFlow(source, sink, _)
+// int explorationLimit() { result = 5 }
+// module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
+// import FlowsPartial::PartialPathGraph
 from Flows::PathNode source, Flows::PathNode sink
 where Flows::flowPath(source, sink)
+// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
+// where FlowsPartial::partialFlow(source, sink, _)
 select sink.getNode(), source, sink, "This node receives flow from $@.", source.getNode(),
   "this source"
