hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Python: Moves old predicates to suffixed form

Browse Source
This commit is contained in:
Rebecca Valentine
2020-03-03 16:53:56 -08:00
parent 400a0f5741
commit a0cf2cbb13
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/ql/src/Exceptions/IllegalExceptionHandlerType.ql
View File

@@ -14,7 +14,7 @@
import python
from ExceptFlowNode ex, Value t, ClassValue c, ControlFlowNode origin, string what
where ex.handledException(t, c, origin) and
where ex.handledException_objectapi(t, c, origin) and
(
exists(ClassValue x | x = t |
not x.isLegalExceptionType() and

4
python/ql/src/semmle/python/types/Exceptions.qll
View File

@@ -271,7 +271,7 @@ class ExceptFlowNode extends ControlFlowNode {
/** Gets the inferred type(s) that are handled by this node, splitting tuples if possible. */
pragma [noinline]
predicate handledException(Object obj, ClassObject cls, ControlFlowNode origin) {
predicate handledException_objectapi(Object obj, ClassObject cls, ControlFlowNode origin) {
this.handledObject(obj, cls, origin) and not cls = theTupleType()
or
not exists(this.getNode().(ExceptStmt).getType()) and obj = theBaseExceptionType() and cls = theTypeType() and
@@ -281,7 +281,7 @@ class ExceptFlowNode extends ControlFlowNode {
/** Whether this `except` handles `cls` */
predicate handles(ClassObject cls) {
exists(ClassObject handled |
this.handledException(handled, _, _) |
this.handledException_objectapi(handled, _, _) |
cls.getAnImproperSuperType() = handled
)
}

2
python/ql/test/2/library-tests/ControlFlow/Exceptions/Handles.ql
View File

@@ -2,5 +2,5 @@
import python
from ExceptFlowNode ex, Object obj
where ex.handledException(obj, _, _)
where ex.handledException_objectapi(obj, _, _)
select ex.getLocation().getStartLine(), ex.toString(), obj.toString()

2
python/ql/test/3/library-tests/ControlFlow/Exceptions/Handles.ql
View File

@@ -2,5 +2,5 @@
import python
from ExceptFlowNode ex, Object obj
where ex.handledException(obj, _, _)
where ex.handledException_objectapi(obj, _, _)
select ex.getLocation().getStartLine(), ex.toString(), obj.toString()

2
python/ql/test/library-tests/exceptions/Handles.ql
View File

@@ -1,5 +1,5 @@
import python
from ExceptFlowNode ex, Object t
where ex.handledException(t, _, _)
where ex.handledException_objectapi(t, _, _)
select ex.getLocation().getStartLine(), ex.toString(), t.toString()