Adds main modifications.

Author: BekaValentine

python/ql/src/Expressions/ExpectedMappingForFormatString.ql

@@ -13,7 +13,7 @@
 import python
 import semmle.python.strings
 
-from Expr e, ClassObject t
+from Expr e, ClassValue t
 where exists(BinaryExpr b | b.getOp() instanceof Mod and format_string(b.getLeft()) and e = b.getRight() and
-mapping_format(b.getLeft()) and e.refersTo(_, t, _) and not t.isMapping())
-select e, "Right hand side of a % operator must be a mapping, not class $@.", t, t.getName()
+mapping_format(b.getLeft()) and e.pointsTo(_, t, _) and not t.isMapping())
+select e, "Right hand side of a % operator must be a mapping, not class $@.", t, t.getName()

python/ql/src/semmle/python/objects/ObjectAPI.qll

@@ -402,6 +402,16 @@ class ClassValue extends Value {
         or
         this.hasAttribute("__getitem__")
     }
+    
+    /** Holds if this class is a mapping.
+     *
+     * This is an attempt to translate ClassObject::isMapping()
+     */
+    predicate isMapping() {
+        exists(this.attr("__getitem__"))
+        and
+        not this instanceof SequenceValue
+    }
 
     /** Holds if this class is a descriptor. */
     predicate isDescriptorType() {