github
diff --git a/‎python/ql/src/semmle/python/types/Builtins.qll‎
Lines changed: 31 additions & 43 deletions b/‎python/ql/src/semmle/python/types/Builtins.qll‎
Lines changed: 31 additions & 43 deletions
@@ -1,14 +1,15 @@
 import python
 
 class Builtin extends @py_cobject {
-
     Builtin() {
         not (
             /* @py_cobjects for modules which have a corresponding Python module */
-            exists(@py_cobject mod_type | py_special_objects(mod_type, "ModuleType") and py_cobjecttypes(this, mod_type)) and
+            exists(@py_cobject mod_type |
+                py_special_objects(mod_type, "ModuleType") and py_cobjecttypes(this, mod_type)
+            ) and
             exists(Module m | py_cobjectnames(this, m.getName()))
-        )
-        and (
+        ) and
+        (
             /* Exclude unmatched builtin objects in the library trap files */
             py_cobjectnames(this, _) or
             py_cobjecttypes(this, _) or
@@ -17,9 +18,11 @@ class Builtin extends @py_cobject {
     }
 
     string toString() {
-        not this = undefinedVariable().asBuiltin() and not this = Builtin::unknown() and
+        not this = undefinedVariable().asBuiltin() and
+        not this = Builtin::unknown() and
         exists(Builtin type, string typename, string objname |
-            py_cobjecttypes(this, type) and py_cobjectnames(this, objname) and typename = type.getName() |
+            py_cobjecttypes(this, type) and py_cobjectnames(this, objname) and typename = type.getName()
+        |
             result = typename + " " + objname
         )
     }
@@ -35,9 +38,7 @@ class Builtin extends @py_cobject {
         py_cmembers_versioned(this, name, result, major_version().toString())
     }
 
-    Builtin getItem(int index) {
-        py_citems(this, index, result)
-    }
+    Builtin getItem(int index) { py_citems(this, index, result) }
 
     Builtin getBaseClass() {
         /* The extractor uses the special name ".super." to indicate the super class of a builtin class */
@@ -50,12 +51,7 @@ class Builtin extends @py_cobject {
         this.getBaseClass().inheritsFromType()
     }
 
-    string getName() {
-        if this.isStr() then
-            result = "str"
-        else
-            py_cobjectnames(this, result)
-    }
+    string getName() { if this.isStr() then result = "str" else py_cobjectnames(this, result) }
 
     private predicate isStr() {
         major_version() = 2 and this = Builtin::special("bytes")
@@ -64,8 +60,10 @@ class Builtin extends @py_cobject {
     }
 
     predicate isClass() {
-        py_cobjecttypes(_, this) or
-        this = Builtin::unknownType() or
+        py_cobjecttypes(_, this)
+        or
+        this = Builtin::unknownType()
+        or
         exists(Builtin meta | meta.inheritsFromType() and py_cobjecttypes(this, meta))
     }
 
@@ -77,9 +75,7 @@ class Builtin extends @py_cobject {
         )
     }
 
-    predicate isModule() {
-        this.getClass() = Builtin::special("ModuleType")
-    }
+    predicate isModule() { this.getClass() = Builtin::special("ModuleType") }
 
     predicate isMethod() {
         this.getClass() = Builtin::special("MethodDescriptorType")
@@ -88,50 +84,42 @@ class Builtin extends @py_cobject {
     }
 
     int intValue() {
-        (this.getClass() = Builtin::special("int") or
-        this.getClass() = Builtin::special("long")) and
+        (
+            this.getClass() = Builtin::special("int") or
+            this.getClass() = Builtin::special("long")
+        ) and
         result = this.getName().toInt()
     }
 
     float floatValue() {
-        (this.getClass() = Builtin::special("float")) and
+        this.getClass() = Builtin::special("float") and
         result = this.getName().toFloat()
     }
 
     string strValue() {
-        (this.getClass() = Builtin::special("unicode") or
-        this.getClass() = Builtin::special("bytes")) and
+        (
+            this.getClass() = Builtin::special("unicode") or
+            this.getClass() = Builtin::special("bytes")
+        ) and
         exists(string quoted_string |
-            quoted_string = this.getName()
-            and
+            quoted_string = this.getName() and
             result = quoted_string.regexpCapture("[bu]'([\\s\\S]*)'", 1)
         )
     }
-
 }
 
 module Builtin {
-
     Builtin builtinModule() {
         py_special_objects(result, "builtin_module_2") and major_version() = 2
         or
         py_special_objects(result, "builtin_module_3") and major_version() = 3
     }
 
-    Builtin builtin(string name) {
-        result = builtinModule().getMember(name)
-    }
+    Builtin builtin(string name) { result = builtinModule().getMember(name) }
 
-    Builtin special(string name) {
-        py_special_objects(result, name)
-    }
+    Builtin special(string name) { py_special_objects(result, name) }
 
-    Builtin unknown() {
-        py_special_objects(result, "_1")
-    }
+    Builtin unknown() { py_special_objects(result, "_1") }
 
-    Builtin unknownType() {
-        py_special_objects(result, "_semmle_unknown_type")
-    }
-
-}
+    Builtin unknownType() { py_special_objects(result, "_semmle_unknown_type") }
+}