Python examples: Modernize snippets.

markshannon · markshannon · commit 562d959915fe · 2019-08-08T10:55:45.000+01:00
diff --git a/python/ql/examples/snippets/builtin_object.ql b/python/ql/examples/snippets/builtin_object.ql
@@ -9,6 +9,6 @@
  
 import python
 
-from Expr e
-where e.refersTo(builtin_object(_))
+from Expr e, string name
+where e.pointsTo(Value::named(name)) and not name.charAt(_) = "."
 select e
diff --git a/python/ql/examples/snippets/call.ql b/python/ql/examples/snippets/call.ql
@@ -8,6 +8,6 @@
  
 import python
 
-from FunctionObject len, CallNode call
+from Value len, CallNode call
 where len.getName() = "len" and len.getACall() = call
 select call
diff --git a/python/ql/examples/snippets/catch_exception.ql b/python/ql/examples/snippets/catch_exception.ql
@@ -9,8 +9,8 @@
  
 import python
 
-from ExceptStmt ex, ClassObject cls
+from ExceptStmt ex, ClassValue cls
 where 
     cls.getName() = "MyExceptionClass" and
-    ex.getType().refersTo(cls)
+    ex.getType().pointsTo(cls)
 select ex
diff --git a/python/ql/examples/snippets/method_call.ql b/python/ql/examples/snippets/method_call.ql
@@ -8,7 +8,7 @@
  
 import python
 
-from AstNode call, FunctionObject method
+from AstNode call, PythonFunctionValue method
 where 
     method.getQualifiedName() = "MyClass.methodName" and
     method.getACall().getNode() = call
diff --git a/python/ql/examples/snippets/new_instance.ql b/python/ql/examples/snippets/new_instance.ql
@@ -9,8 +9,8 @@
  
 import python
 
-from Call new, ClassObject cls
+from Call new, ClassValue cls
 where
     cls.getName() = "MyClass" and
-    new.getFunc().refersTo(cls)
+    new.getFunc().pointsTo(cls)
 select new
diff --git a/python/ql/examples/snippets/print.ql b/python/ql/examples/snippets/print.ql
@@ -13,5 +13,5 @@ where
     print instanceof Print
     or
     /* Python 3 or with `from __future__ import print_function` */
-    print.(Call).getFunc().refersTo(thePrintFunction())
+    print.(Call).getFunc().pointsTo(Value::named("print"))
 select print
diff --git a/python/ql/examples/snippets/raise_exception.ql b/python/ql/examples/snippets/raise_exception.ql
@@ -9,12 +9,10 @@
  
 import python
 
-from Raise raise, ClassObject ex
+from Raise raise, ClassValue ex
 where
     ex.getName() = "AnException" and
     (
-        raise.getException().refersTo(ex.getAnImproperSuperType())
-        or
-        raise.getException().refersTo(_, ex.getAnImproperSuperType(), _)
+        raise.getException().pointsTo(ex.getASuperType())
     )
 select raise, "Don't raise instances of 'AnException'"
diff --git a/python/ql/examples/snippets/recursion.ql b/python/ql/examples/snippets/recursion.ql
@@ -8,6 +8,6 @@
 
 import python
 
-from FunctionObject f
-where f.getACallee() = f
+from PythonFunctionValue f
+where f.getACall().getScope() = f.getScope()
 select f
diff --git a/python/ql/examples/snippets/store_none.ql b/python/ql/examples/snippets/store_none.ql
@@ -14,5 +14,5 @@ import python
 from SubscriptNode store
 where 
     store.isStore() and
-    store.getIndex().refersTo(theNoneObject())
+    store.getIndex().pointsTo(Value::named("None"))
 select store

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,10 @@`
`9`	`9`
`10`	`10`	`import python`
`11`	`11`
`12`		`-from Raise raise, ClassObject ex`
	`12`	`+from Raise raise, ClassValue ex`
`13`	`13`	`where`
`14`	`14`	`ex.getName() = "AnException" and`
`15`	`15`	`(`
`16`		`- raise.getException().refersTo(ex.getAnImproperSuperType())`
`17`		`- or`
`18`		`- raise.getException().refersTo(_, ex.getAnImproperSuperType(), _)`
	`16`	`+ raise.getException().pointsTo(ex.getASuperType())`
`19`	`17`	`)`
`20`	`18`	`select raise, "Don't raise instances of 'AnException'"`