Merge pull request #13371 from github/nickrolfe/python-location-tostring

Python: avoid selecting `getLocation()`

Author: tausbn

python/ql/src/Expressions/TruncatedDivision.ql

@@ -34,4 +34,4 @@ where
     )
   )
 select div, "Result of division may be truncated as its $@ and $@ arguments may both be integers.",
-  left.getLocation(), "left", right.getLocation(), "right"
+  left, "left", right, "right"

python/ql/src/Statements/UnnecessaryDelete.ql

@@ -36,5 +36,5 @@ where
     ex = Value::named("sys.exc_info") and
     ex.getACall().getScope() = f
   )
-select del, "Unnecessary deletion of local variable $@ in function $@.", e.getLocation(),
-  e.toString(), f.getLocation(), f.getName()
+select del, "Unnecessary deletion of local variable $@ in function $@.", e, e.toString(), f,
+  f.getName()

python/ql/test/2/query-tests/Expressions/TruncatedDivision.expected

@@ -1,2 +1,2 @@
-| TruncatedDivision_test.py:65:7:65:11 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:65:7:65:7 | TruncatedDivision_test.py:65 | left | TruncatedDivision_test.py:65:11:65:11 | TruncatedDivision_test.py:65 | right |
-| TruncatedDivision_test.py:72:7:72:35 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:25:12:25:12 | TruncatedDivision_test.py:25 | left | TruncatedDivision_test.py:28:12:28:12 | TruncatedDivision_test.py:28 | right |
+| TruncatedDivision_test.py:65:7:65:11 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:65:7:65:7 | ControlFlowNode for IntegerLiteral | left | TruncatedDivision_test.py:65:11:65:11 | ControlFlowNode for IntegerLiteral | right |
+| TruncatedDivision_test.py:72:7:72:35 | BinaryExpr | Result of division may be truncated as its $@ and $@ arguments may both be integers. | TruncatedDivision_test.py:25:12:25:12 | ControlFlowNode for IntegerLiteral | left | TruncatedDivision_test.py:28:12:28:12 | ControlFlowNode for IntegerLiteral | right |

python/ql/test/query-tests/Statements/general/UnnecessaryDelete.expected

@@ -1 +1 @@
-| statements_test.py:187:5:187:9 | Delete | Unnecessary deletion of local variable $@ in function $@. | statements_test.py:187:9:187:9 | statements_test.py:187 | x | statements_test.py:185:1:185:31 | statements_test.py:185 | error_unnecessary_delete |
+| statements_test.py:187:5:187:9 | Delete | Unnecessary deletion of local variable $@ in function $@. | statements_test.py:187:9:187:9 | x | x | statements_test.py:185:1:185:31 | Function error_unnecessary_delete | error_unnecessary_delete |