Skip to content

Commit 30d3c3e

Browse files
committed
python: fix warnings
- rename `Conf` -> `Config` - comment out unused code - rearrange code so it is easy to see how to swap comments - autoformat
1 parent e65ff68 commit 30d3c3e

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

python/ql/test/experimental/meta/debug/InlineTaintTestPaths.ql

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,24 @@ import semmle.python.dataflow.new.DataFlow
1212
import semmle.python.dataflow.new.TaintTracking
1313
import experimental.meta.InlineTaintTest::Conf
1414

15-
module Conf implements DataFlow::ConfigSig {
15+
module Config implements DataFlow::ConfigSig {
1616
predicate isSource(DataFlow::Node source) {
17-
any (TestTaintTrackingConfiguration c).isSource(source)
17+
any(TestTaintTrackingConfiguration c).isSource(source)
1818
}
19-
predicate isSink(DataFlow::Node source) {
20-
any (TestTaintTrackingConfiguration c).isSink(source)
21-
}
22-
}
23-
int explorationLimit() { result = 5 }
2419

25-
module Flows = TaintTracking::Global<Conf>;
20+
predicate isSink(DataFlow::Node source) { any(TestTaintTrackingConfiguration c).isSink(source) }
21+
}
2622

27-
module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
23+
module Flows = TaintTracking::Global<Config>;
2824

29-
// import FlowsPartial::PartialPathGraph
3025
import Flows::PathGraph
3126

32-
// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
33-
// where FlowsPartial::partialFlow(source, sink, _)
27+
// int explorationLimit() { result = 5 }
28+
// module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
29+
// import FlowsPartial::PartialPathGraph
3430
from Flows::PathNode source, Flows::PathNode sink
3531
where Flows::flowPath(source, sink)
32+
// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
33+
// where FlowsPartial::partialFlow(source, sink, _)
3634
select sink.getNode(), source, sink, "This node receives taint from $@.", source.getNode(),
3735
"this source"

python/ql/test/experimental/meta/debug/dataflowTestPaths.ql

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,22 @@ import python
1111
import semmle.python.dataflow.new.DataFlow
1212
import experimental.dataflow.testConfig
1313

14-
module Conf implements DataFlow::ConfigSig {
14+
module Config implements DataFlow::ConfigSig {
1515
predicate isSource(DataFlow::Node source) { any(TestConfiguration c).isSource(source) }
1616

1717
predicate isSink(DataFlow::Node source) { any(TestConfiguration c).isSink(source) }
1818
}
1919

20-
int explorationLimit() { result = 5 }
20+
module Flows = DataFlow::Global<Config>;
2121

22-
module Flows = DataFlow::Global<Conf>;
23-
24-
module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
25-
26-
// import FlowsPartial::PartialPathGraph
2722
import Flows::PathGraph
2823

29-
// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
30-
// where FlowsPartial::partialFlow(source, sink, _)
24+
// int explorationLimit() { result = 5 }
25+
// module FlowsPartial = Flows::FlowExploration<explorationLimit/0>;
26+
// import FlowsPartial::PartialPathGraph
3127
from Flows::PathNode source, Flows::PathNode sink
3228
where Flows::flowPath(source, sink)
29+
// from FlowsPartial::PartialPathNode source, FlowsPartial::PartialPathNode sink
30+
// where FlowsPartial::partialFlow(source, sink, _)
3331
select sink.getNode(), source, sink, "This node receives flow from $@.", source.getNode(),
3432
"this source"

0 commit comments

Comments
 (0)