Python: Fix modernisation of py/iteration-string-and-sequence

RasmusWL · RasmusWL · commit d7b803a8593b · 2020-02-19T14:12:22.000+01:00
Introduced a regression, since the old code was:

```
predicate is_a_string_type(ClassObject seqtype) {
    seqtype = theBytesType() and major_version() = 2
    or
    seqtype = theUnicodeType()
}
```

but *now* we're good!
diff --git a/python/ql/src/Statements/IterableStringOrSequence.ql b/python/ql/src/Statements/IterableStringOrSequence.ql
@@ -13,15 +13,20 @@
 
 import python
 
+predicate has_string_type(Value v) {
+    v.getClass() = ClassValue::bytes() and major_version() = 2
+    or
+    v.getClass() = ClassValue::unicode()
+}
 
 from
     For loop, ControlFlowNode iter, Value str, Value seq, ControlFlowNode seq_origin, ControlFlowNode str_origin
 where
     loop.getIter().getAFlowNode() = iter and
     iter.pointsTo(str, str_origin) and
     iter.pointsTo(seq, seq_origin) and
-    str.getClass() = ClassValue::str() and
+    has_string_type(str) and
     seq.getClass().isIterable() and
-    not seq.getClass() = ClassValue::str()
+    not has_string_type(seq)
 select loop, "Iteration over $@, of class " + seq.getClass().getName() + ", may also iterate over $@.",
     seq_origin, "sequence", str_origin, "string"
