py: Inline expectation should have space before $

python/ql/test/library-tests/ApiGraphs/py2/test.py

@@ -1,3 +1,3 @@
 def python2_style():
-    from __builtin__ import open #$ use=moduleImport("builtins").getMember("open")
-    open("hello.txt") #$ use=moduleImport("builtins").getMember("open").getReturn()
+    from __builtin__ import open # $ use=moduleImport("builtins").getMember("open")
+    open("hello.txt") # $ use=moduleImport("builtins").getMember("open").getReturn()

python/ql/test/library-tests/ApiGraphs/py3/deftest1.py

@@ -1,29 +1,29 @@
-from mypkg import foo  #$ use=moduleImport("mypkg").getMember("foo")
+from mypkg import foo  # $ use=moduleImport("mypkg").getMember("foo")
 
-def callback(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0)
-    x.baz() #$ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0).getMember("baz").getReturn()
+def callback(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0)
+    x.baz() # $ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0).getMember("baz").getReturn()
 
-foo.bar(callback) #$ def=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("bar").getReturn()
+foo.bar(callback) # $ def=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("bar").getReturn()
 
-def callback2(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0)
-    x.baz2() #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0).getMember("baz2").getReturn()
+def callback2(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0)
+    x.baz2() # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0).getMember("baz2").getReturn()
 
 mydict = {
-  "c": callback2, #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
-  "other": "whatever" #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
+  "c": callback2, # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
+  "other": "whatever" # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
 }
 
-foo.baz(mydict) #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("baz").getReturn()
+foo.baz(mydict) # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("baz").getReturn()
 
-def callback3(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0)
-    x.baz3() #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0).getMember("baz3").getReturn()
+def callback3(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0)
+    x.baz3() # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0).getMember("baz3").getReturn()
 
-mydict.third = callback3 #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third")
+mydict.third = callback3 # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third")
 
-foo.blab(mydict) #$ def=moduleImport("mypkg").getMember("foo").getMember("blab").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("blab").getReturn()
+foo.blab(mydict) # $ def=moduleImport("mypkg").getMember("foo").getMember("blab").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("blab").getReturn()
 
-def callback4(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0)
-    x.baz4() #$ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0).getMember("baz4").getReturn()
+def callback4(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0)
+    x.baz4() # $ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0).getMember("baz4").getReturn()
 
 otherDict = {
     # TODO: Backtracking through a property set using a dict doesn't work, but I can backtrack through explicit property writes, e.g. the `otherDict.fourth` below.
@@ -32,30 +32,30 @@ otherDict = {
 }
 otherDict.fourth = callback4
 
-foo.quack(otherDict.fourth) #$ def=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("quack").getReturn()
+foo.quack(otherDict.fourth) # $ def=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("quack").getReturn()
 
 def namedCallback(myName, otherName):
     # Using named parameters:
-    myName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("myName").getReturn()
-    otherName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("otherName").getReturn()
+    myName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("myName").getReturn()
+    otherName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("otherName").getReturn()
     # Using numbered parameters:
-    myName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(0).getReturn()
-    otherName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(1).getReturn()
+    myName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(0).getReturn()
+    otherName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(1).getReturn()
 
-foo.blob(namedCallback) #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getReturn()
+foo.blob(namedCallback) # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getReturn()
 
-foo.named(myName = 2) #$ def=moduleImport("mypkg").getMember("foo").getMember("named").getKeywordParameter("myName")
+foo.named(myName = 2) # $ def=moduleImport("mypkg").getMember("foo").getMember("named").getKeywordParameter("myName")
 
 
 def recusisionCallback(x):
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
 
 recursiveDict = {};
 recursiveDict.callback = recusisionCallback;
 recursiveDict.rec1 = recursiveDict;
 recursiveDict.rec2 = recursiveDict;
 
-foo.rec(recursiveDict); #$ def=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0)
+foo.rec(recursiveDict); # $ def=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0)

python/ql/test/library-tests/ApiGraphs/py3/deftest2.py

@@ -1,22 +1,22 @@
 # Subclasses
 
-from flask.views import View #$ use=moduleImport("flask").getMember("views").getMember("View")
+from flask.views import View # $ use=moduleImport("flask").getMember("views").getMember("View")
 
-class MyView(View): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
-    myvar = 45 #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("myvar")
-    def my_method(self): #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method")
-        return 3 #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method").getReturn()
+class MyView(View): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
+    myvar = 45 # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("myvar")
+    def my_method(self): # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method")
+        return 3 # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method").getReturn()
 
-instance = MyView() #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getReturn()
+instance = MyView() # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getReturn()
 
 def internal():
-    from pflask.views import View #$ use=moduleImport("pflask").getMember("views").getMember("View")
-    class IntMyView(View): #$ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass()
-        my_internal_var = 35 #$ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_var")
-        def my_internal_method(self): #$ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_method")
+    from pflask.views import View # $ use=moduleImport("pflask").getMember("views").getMember("View")
+    class IntMyView(View): # $ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass()
+        my_internal_var = 35 # $ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_var")
+        def my_internal_method(self): # $ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_method")
             pass
 
-    int_instance = IntMyView() #$ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getReturn()
+    int_instance = IntMyView() # $ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getReturn()
 
 # ------------------------------------------------------------------------------
 # Class decorator
@@ -27,8 +27,8 @@ def my_class_decorator(cls):
     return cls
 
 @my_class_decorator
-class MyViewWithDecorator(View): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
+class MyViewWithDecorator(View): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
     pass
 
-class SubclassFromDecorated(MyViewWithDecorator): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getASubclass()
+class SubclassFromDecorated(MyViewWithDecorator): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getASubclass()
     pass

python/ql/test/library-tests/ApiGraphs/py3/test.py

@@ -1,44 +1,44 @@
-import a1 #$ use=moduleImport("a1")
+import a1 # $ use=moduleImport("a1")
 
-x = a1.blah1 #$ use=moduleImport("a1").getMember("blah1")
+x = a1.blah1 # $ use=moduleImport("a1").getMember("blah1")
 
-import a2 as m2 #$ use=moduleImport("a2")
+import a2 as m2 # $ use=moduleImport("a2")
 
-x2 = m2.blah2 #$ use=moduleImport("a2").getMember("blah2")
+x2 = m2.blah2 # $ use=moduleImport("a2").getMember("blah2")
 
-import a3.b3 as m3 #$ use=moduleImport("a3").getMember("b3")
+import a3.b3 as m3 # $ use=moduleImport("a3").getMember("b3")
 
-x3 = m3.blah3 #$  use=moduleImport("a3").getMember("b3").getMember("blah3")
+x3 = m3.blah3 # $  use=moduleImport("a3").getMember("b3").getMember("blah3")
 
-from a4.b4 import c4 as m4 #$ use=moduleImport("a4").getMember("b4").getMember("c4")
+from a4.b4 import c4 as m4 # $ use=moduleImport("a4").getMember("b4").getMember("c4")
 
-x4 = m4.blah4 #$ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
+x4 = m4.blah4 # $ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
 
-import a.b.c.d #$ use=moduleImport("a")
+import a.b.c.d # $ use=moduleImport("a")
 
-ab = a.b #$ use=moduleImport("a").getMember("b")
+ab = a.b # $ use=moduleImport("a").getMember("b")
 
-abc = ab.c #$ use=moduleImport("a").getMember("b").getMember("c")
+abc = ab.c # $ use=moduleImport("a").getMember("b").getMember("c")
 
-abcd = abc.d #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d")
+abcd = abc.d # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d")
 
-x5 = abcd.method() #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
+x5 = abcd.method() # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
 
 from a.b.c.d import method
-x5_alt = method() #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
+x5_alt = method() # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
 
-from a6 import m6 #$ use=moduleImport("a6").getMember("m6")
+from a6 import m6 # $ use=moduleImport("a6").getMember("m6")
 
-x6 = m6().foo().bar() #$ use=moduleImport("a6").getMember("m6").getReturn().getMember("foo").getReturn().getMember("bar").getReturn()
+x6 = m6().foo().bar() # $ use=moduleImport("a6").getMember("m6").getReturn().getMember("foo").getReturn().getMember("bar").getReturn()
 
-import foo.baz.baz as fbb #$ use=moduleImport("foo").getMember("baz").getMember("baz")
-from foo.bar.baz import quux as fbbq #$ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
-from ham.bar.eggs import spam as hbes #$ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
-fbb.quux #$ use=moduleImport("foo").getMember("baz").getMember("baz").getMember("quux")
-fbbq #$ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
-hbes #$ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
+import foo.baz.baz as fbb # $ use=moduleImport("foo").getMember("baz").getMember("baz")
+from foo.bar.baz import quux as fbbq # $ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
+from ham.bar.eggs import spam as hbes # $ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
+fbb.quux # $ use=moduleImport("foo").getMember("baz").getMember("baz").getMember("quux")
+fbbq # $ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
+hbes # $ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
 
-import foo.bar.baz #$ use=moduleImport("foo")
+import foo.bar.baz # $ use=moduleImport("foo")
 
 # Relative imports. These are ignored
 
@@ -50,51 +50,51 @@ from ..foobar import baz
 # Use of imports across scopes
 
 def use_m4():
-    x = m4.blah4 #$ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
+    x = m4.blah4 # $ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
 
 def local_import_use():
-    from foo import bar #$ use=moduleImport("foo").getMember("bar")
+    from foo import bar # $ use=moduleImport("foo").getMember("bar")
 
-    x = bar() #$ use=moduleImport("foo").getMember("bar").getReturn()
+    x = bar() # $ use=moduleImport("foo").getMember("bar").getReturn()
 
-from eggs import ham as spam #$ use=moduleImport("eggs").getMember("ham")
+from eggs import ham as spam # $ use=moduleImport("eggs").getMember("ham")
 
 def bbb():
-    f = spam #$ use=moduleImport("eggs").getMember("ham")
+    f = spam # $ use=moduleImport("eggs").getMember("ham")
 
-from danger import SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+from danger import SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
-foo = SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+foo = SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
 def change_foo():
     global foo
-    foo = SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+    foo = SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
 def f():
     global foo
-    sink(foo) #$ use=moduleImport("danger").getMember("SOURCE")
+    sink(foo) # $ use=moduleImport("danger").getMember("SOURCE")
     foo = NONSOURCE
     change_foo()
-    sink(foo) #$ use=moduleImport("danger").getMember("SOURCE")
+    sink(foo) # $ use=moduleImport("danger").getMember("SOURCE")
 
 
 # Built-ins
 
 def use_of_builtins():
-    for x in range(5): #$ use=moduleImport("builtins").getMember("range").getReturn()
-        if x < len([]): #$ use=moduleImport("builtins").getMember("len").getReturn()
-            print("Hello") #$ use=moduleImport("builtins").getMember("print").getReturn()
-            raise Exception("Farewell") #$ use=moduleImport("builtins").getMember("Exception").getReturn()
+    for x in range(5): # $ use=moduleImport("builtins").getMember("range").getReturn()
+        if x < len([]): # $ use=moduleImport("builtins").getMember("len").getReturn()
+            print("Hello") # $ use=moduleImport("builtins").getMember("print").getReturn()
+            raise Exception("Farewell") # $ use=moduleImport("builtins").getMember("Exception").getReturn()
 
 def imported_builtins():
-    import builtins #$ use=moduleImport("builtins")
+    import builtins # $ use=moduleImport("builtins")
     def open(f):
-        return builtins.open(f) #$ use=moduleImport("builtins").getMember("open").getReturn()
+        return builtins.open(f) # $ use=moduleImport("builtins").getMember("open").getReturn()
 
 def redefine_print():
     def my_print(x):
-        import builtins #$ use=moduleImport("builtins")
-        builtins.print("I'm printing", x) #$ use=moduleImport("builtins").getMember("print").getReturn()
+        import builtins # $ use=moduleImport("builtins")
+        builtins.print("I'm printing", x) # $ use=moduleImport("builtins").getMember("print").getReturn()
     print = my_print
     print("these words")
 
@@ -109,13 +109,13 @@ def global_redefine_chr():
 
 def what_is_chr_now():
     # If global_redefine_chr has been run, then the following is _not_ a reference to the built-in chr
-    return chr(123) #$ MISSING: use=moduleImport("builtins").getMember("chr").getReturn()
+    return chr(123) # $ MISSING: use=moduleImport("builtins").getMember("chr").getReturn()
 
 def obscured_print():
-    p = print #$ use=moduleImport("builtins").getMember("print")
-    p("Can you see me?") #$ use=moduleImport("builtins").getMember("print").getReturn()
+    p = print # $ use=moduleImport("builtins").getMember("print")
+    p("Can you see me?") # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def python2_style():
     # In Python 3, `__builtin__` has no special meaning.
-    from __builtin__ import open #$ use=moduleImport("__builtin__").getMember("open")
-    open("hello.txt") #$ use=moduleImport("__builtin__").getMember("open").getReturn()
+    from __builtin__ import open # $ use=moduleImport("__builtin__").getMember("open")
+    open("hello.txt") # $ use=moduleImport("__builtin__").getMember("open").getReturn()

python/ql/test/library-tests/ApiGraphs/py3/test1.py

@@ -1,6 +1,6 @@
-import mypkg #$ use=moduleImport("mypkg")
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+import mypkg # $ use=moduleImport("mypkg")
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 try:
-    print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar")
-except AttributeError as e: #$ use=moduleImport("builtins").getMember("AttributeError")
-    print(e)  #$ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
+    print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar")
+except AttributeError as e: # $ use=moduleImport("builtins").getMember("AttributeError")
+    print(e)  # $ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'

python/ql/test/library-tests/ApiGraphs/py3/test2.py

@@ -1,4 +1,4 @@
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
-from mypkg import bar #$ use=moduleImport("mypkg").getMember("bar")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo")
-print(bar) #$ use=moduleImport("mypkg").getMember("bar")
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
+from mypkg import bar # $ use=moduleImport("mypkg").getMember("bar")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo")
+print(bar) # $ use=moduleImport("mypkg").getMember("bar")

python/ql/test/library-tests/ApiGraphs/py3/test3.py

@@ -1,4 +1,4 @@
-import mypkg.foo #$ use=moduleImport("mypkg")
-import mypkg.bar #$ use=moduleImport("mypkg")
-print(mypkg.foo)  #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
-print(mypkg.bar)  #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+import mypkg.bar # $ use=moduleImport("mypkg")
+print(mypkg.foo)  # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+print(mypkg.bar)  # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...

python/ql/test/library-tests/ApiGraphs/py3/test4.py

@@ -1,4 +1,4 @@
-import mypkg.foo as _foo #$ use=moduleImport("mypkg").getMember("foo")
-import mypkg.bar as _bar #$ use=moduleImport("mypkg").getMember("bar")
-print(_foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
-print(_bar) #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+import mypkg.foo as _foo # $ use=moduleImport("mypkg").getMember("foo")
+import mypkg.bar as _bar # $ use=moduleImport("mypkg").getMember("bar")
+print(_foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+print(_bar) # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...

python/ql/test/library-tests/ApiGraphs/py3/test5.py

@@ -1,10 +1,10 @@
-import mypkg #$ use=moduleImport("mypkg")
+import mypkg # $ use=moduleImport("mypkg")
 
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 try:
-    print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar")
-except AttributeError as e: #$ use=moduleImport("builtins").getMember("AttributeError")
-    print(e)  #$ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
+    print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar")
+except AttributeError as e: # $ use=moduleImport("builtins").getMember("AttributeError")
+    print(e)  # $ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
 
-from mypkg import bar as _bar #$ use=moduleImport("mypkg").getMember("bar")
-print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+from mypkg import bar as _bar # $ use=moduleImport("mypkg").getMember("bar")
+print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...

python/ql/test/library-tests/ApiGraphs/py3/test6.py

@@ -1,6 +1,6 @@
-import mypkg #$ use=moduleImport("mypkg")
+import mypkg # $ use=moduleImport("mypkg")
 
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 
-import mypkg.foo #$ use=moduleImport("mypkg")
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...

python/ql/test/library-tests/ApiGraphs/py3/test7.py

@@ -1,10 +1,10 @@
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
 
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 
-import mypkg.foo #$ use=moduleImport("mypkg")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
 
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...

python/ql/test/library-tests/ApiGraphs/py3/test_annotations.py

@@ -1,25 +1,25 @@
 from types import AssignmentAnnotation, ParameterAnnotation
 
 def test_annotated_assignment():
-    local_x : AssignmentAnnotation = create_x() #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    local_x #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+    local_x : AssignmentAnnotation = create_x() # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    local_x # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-global_x : AssignmentAnnotation #$ use=moduleImport("types").getMember("AssignmentAnnotation")
-global_x #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+global_x : AssignmentAnnotation # $ use=moduleImport("types").getMember("AssignmentAnnotation")
+global_x # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-def test_parameter_annotation(parameter_y: ParameterAnnotation): #$ use=moduleImport("types").getMember("ParameterAnnotation")
-    parameter_y #$ use=moduleImport("types").getMember("ParameterAnnotation").getAnnotatedInstance()
+def test_parameter_annotation(parameter_y: ParameterAnnotation): # $ use=moduleImport("types").getMember("ParameterAnnotation")
+    parameter_y # $ use=moduleImport("types").getMember("ParameterAnnotation").getAnnotatedInstance()
 
 type Alias = AssignmentAnnotation
 
-global_z : Alias #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-global_z #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+global_z : Alias # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+global_z # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-def test_parameter_alias(parameter_z: Alias): #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    parameter_z #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+def test_parameter_alias(parameter_z: Alias): # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    parameter_z # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
 # local type aliases
 def test_local_type_alias():
     type LocalAlias = AssignmentAnnotation
-    local_alias : LocalAlias = create_value() #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    local_alias #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+    local_alias : LocalAlias = create_value() # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    local_alias # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()

python/ql/test/library-tests/ApiGraphs/py3/test_captured.py

@@ -1,14 +1,14 @@
 from html import escape
 
 def p(x):
-    return escape(x) #$ use=moduleImport("html").getMember("escape").getReturn()
+    return escape(x) # $ use=moduleImport("html").getMember("escape").getReturn()
 
 def p_list(l):
-    return ", ".join(p(x) for x in l) #$ use=moduleImport("html").getMember("escape").getReturn()
+    return ", ".join(p(x) for x in l) # $ use=moduleImport("html").getMember("escape").getReturn()
 
 def pp_list(l):
     def pp(x):
-        return escape(x) #$ use=moduleImport("html").getMember("escape").getReturn()
+        return escape(x) # $ use=moduleImport("html").getMember("escape").getReturn()
 
     def pp_list_inner(l):
-        return ", ".join(pp(x) for x in l) #$ use=moduleImport("html").getMember("escape").getReturn()
+        return ", ".join(pp(x) for x in l) # $ use=moduleImport("html").getMember("escape").getReturn()

python/ql/test/library-tests/ApiGraphs/py3/test_captured_flask.py

@@ -4,11 +4,11 @@ from flask_user import UserMixin
 
 def create_app():
   app = Flask(__name__)
-  db = SQLAlchemy(app)  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn()
+  db = SQLAlchemy(app)  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn()
 
-  class Users(db.Model, UserMixin):  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass()
+  class Users(db.Model, UserMixin):  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass()
       __tablename__ = 'users'
 
   @app.route('/v2/user/<int:id>', methods=['GET','PUT'])
   def users(id):
-      Users.query.filter_by(id=id).first()  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass().getMember("query").getMember("filter_by")
+      Users.query.filter_by(id=id).first()  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass().getMember("query").getMember("filter_by")

python/ql/test/library-tests/ApiGraphs/py3/test_captured_inheritance.py

@@ -10,17 +10,17 @@ def func():
     class Bar(B): pass
 
     class Baz(A): pass
-    
+
     def other_func():
-        print(Foo)  #$ use=moduleImport("foo").getMember("A").getASubclass() use=moduleImport("foo").getMember("B").getASubclass()
+        print(Foo)  # $ use=moduleImport("foo").getMember("A").getASubclass() use=moduleImport("foo").getMember("B").getASubclass()
         # On the next line, we wish to express that it is not possible for `Bar` to be a subclass of `A`.
         # However, we have no "true negative" annotation, so we use the MISSING annotation instead.
         # (Normally, "true negative" is not needed as all applicable annotations must be present,
-        # but these API graph tests work differently, since having all results recorded in annotations 
+        # but these API graph tests work differently, since having all results recorded in annotations
         # would be excessive)
-        print(Bar)  #$ use=moduleImport("foo").getMember("B").getASubclass() MISSING: use=moduleImport("foo").getMember("A").getASubclass()
-        print(Baz)  #$ use=moduleImport("foo").getMember("B").getASubclass() SPURIOUS: use=moduleImport("foo").getMember("A").getASubclass()
+        print(Bar)  # $ use=moduleImport("foo").getMember("B").getASubclass() MISSING: use=moduleImport("foo").getMember("A").getASubclass()
+        print(Baz)  # $ use=moduleImport("foo").getMember("B").getASubclass() SPURIOUS: use=moduleImport("foo").getMember("A").getASubclass()
 
     class Baz(B): pass
 
-    other_func()
+    other_func()

python/ql/test/library-tests/ApiGraphs/py3/test_deep.py

@@ -1,4 +1,4 @@
-from start.middle.end import foo #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
-from start.middle.end import bar #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
-print(foo) #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
-print(bar) #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
+from start.middle.end import foo # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
+from start.middle.end import bar # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
+print(foo) # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
+print(bar) # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")

python/ql/test/library-tests/ApiGraphs/py3/test_entry_point.py

@@ -1,2 +1,2 @@
-"magic_string".foo.bar #$ use=entryPoint("CustomEntryPoint").getMember("foo").getMember("bar")
+"magic_string".foo.bar # $ use=entryPoint("CustomEntryPoint").getMember("foo").getMember("bar")
 "magic_string2".foo.bar

python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py

@@ -1,12 +1,12 @@
 # Star imports
 
-from unknown import * #$ use=moduleImport("unknown")
+from unknown import * # $ use=moduleImport("unknown")
 
 # This used to be missing, as we did not consider `hello` to be a `LocalSourceNode`,
 # since it has flow going into it from its corresponding `GlobalSsaVariable`.
-hello() #$ use=moduleImport("unknown").getMember("hello").getReturn()
+hello() # $ use=moduleImport("unknown").getMember("hello").getReturn()
 
-print(const_from_unknown) #$ use=moduleImport("unknown").getMember("const_from_unknown")
+print(const_from_unknown) # $ use=moduleImport("unknown").getMember("const_from_unknown")
 
 # We don't want our analysis to think that either `non_module_member` or `outer_bar` can
 # come from `from unknown import *`
@@ -16,23 +16,23 @@ outer_bar = 5
 outer_bar
 
 def foo():
-    world() #$ use=moduleImport("unknown").getMember("world").getReturn()
+    world() # $ use=moduleImport("unknown").getMember("world").getReturn()
     bar = 5
     bar
     non_module_member
-    print(bar) #$ use=moduleImport("builtins").getMember("print").getReturn()
+    print(bar) # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def quux():
     global non_module_member
     non_module_member = 5
 
 def func1():
-    var() #$ use=moduleImport("unknown").getMember("var").getReturn()
+    var() # $ use=moduleImport("unknown").getMember("var").getReturn()
     def func2():
         var = "FOO"
 
 def func3():
-    var2 = print #$ use=moduleImport("builtins").getMember("print")
+    var2 = print # $ use=moduleImport("builtins").getMember("print")
     def func4():
-        var2() #$ use=moduleImport("builtins").getMember("print").getReturn()
+        var2() # $ use=moduleImport("builtins").getMember("print").getReturn()
     func4()

python/ql/test/library-tests/ApiGraphs/py3/test_import_star2.py

@@ -1,14 +1,14 @@
 # Star imports in local scope
 
-hello2() 
+hello2()
 
 def foo():
-    from unknown2 import * #$ use=moduleImport("unknown2")
-    world2() #$ use=moduleImport("unknown2").getMember("world2").getReturn()
+    from unknown2 import * # $ use=moduleImport("unknown2")
+    world2() # $ use=moduleImport("unknown2").getMember("world2").getReturn()
     bar2 = 5
     bar2
     non_module_member2
-    print(bar2) #$ use=moduleImport("builtins").getMember("print").getReturn()
+    print(bar2) # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def quux2():
     global non_module_member2

python/ql/test/library-tests/ApiGraphs/py3/test_subscript.py

@@ -1,8 +1,8 @@
 import mypkg
 
 def test_subscript():
-    bar = mypkg.foo()["bar"] #$ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["baz"] = 42 #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["qux"] += 42 #$ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["qux"] += 42 #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()[mypkg.index] = mypkg.value #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    bar = mypkg.foo()["bar"] # $ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["baz"] = 42 # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["qux"] += 42 # $ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["qux"] += 42 # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()[mypkg.index] = mypkg.value # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()