Python: Modernise cherrypy library

Author: RasmusWL

python/ql/src/semmle/python/web/cherrypy/General.qll

@@ -3,18 +3,18 @@ import semmle.python.web.Http
 
 module CherryPy {
 
-    FunctionObject expose() {
-        result = ModuleObject::named("cherrypy").attr("expose")
+    FunctionValue expose() {
+        result = Value::named("cherrypy.expose")
     }
 
 }
 
 class CherryPyExposedFunction extends Function {
 
     CherryPyExposedFunction() {
-        this.getADecorator().refersTo(CherryPy::expose())
+        this.getADecorator().pointsTo(CherryPy::expose())
         or
-        this.getADecorator().(Call).getFunc().refersTo(CherryPy::expose())
+        this.getADecorator().(Call).getFunc().pointsTo(CherryPy::expose())
     }
 
 }
@@ -23,10 +23,10 @@ class CherryPyRoute extends CallNode {
 
     CherryPyRoute() {
         /* cherrypy.quickstart(root, script_name, config) */
-        ModuleObject::named("cherrypy").attr("quickstart").(FunctionObject).getACall() = this
+        Value::named("cherrypy.quickstart").(FunctionValue).getACall() = this
         or
         /* cherrypy.tree.mount(root, script_name, config) */
-        this.getFunction().(AttrNode).getObject("mount").refersTo(ModuleObject::named("cherrypy").attr("tree"))
+        this.getFunction().(AttrNode).getObject("mount").pointsTo(Value::named("cherrypy.tree"))
     }
 
     ClassObject getAppClass() {

python/ql/src/semmle/python/web/cherrypy/Request.qll

@@ -54,7 +54,7 @@ class CherryPyExposedFunctionParameter extends TaintSource {
 class CherryPyRequestSource extends TaintSource {
 
     CherryPyRequestSource() {
-        this.(ControlFlowNode).refersTo(ModuleObject::named("cherrypy").attr("request"))
+        this.(ControlFlowNode).pointsTo(Value::named("cherrypy.request"))
     }
 
     override predicate isSourceOf(TaintKind kind) {

python/ql/test/library-tests/web/cherrypy/Sources.expected

@@ -1,4 +1,3 @@
 | ../../../query-tests/Security/lib/cherrypy/__init__.py:10 | _ThreadLocalProxy() | cherrypy.request |
-| ../../../query-tests/Security/lib/cherrypy/__init__.py:10 | request | cherrypy.request |
 | test.py:10 | arg | externally controlled string |
 | test.py:16 | arg | externally controlled string |