Convert selected Python qlref tests to inline expectations

python/ql/test/2/query-tests/Classes/inconsistent-mro/InconsistentMRO.qlref

@@ -1 +1,2 @@
-Classes/InconsistentMRO.ql
+query: Classes/InconsistentMRO.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/inconsistent-mro/inconsistent_mro.py

@@ -6,7 +6,7 @@ class X(object):
 class Y(X):
     pass
 
-class Z(X, Y):
+class Z(X, Y): # $ Alert
     pass
 
 class O:

python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/PropertyInOldStyleClass.ql
+query: Classes/PropertyInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/SlotsInOldStyleClass.ql
+query: Classes/SlotsInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/SuperInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/SuperInOldStyleClass.ql
+query: Classes/SuperInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/newstyle_test.py

@@ -1,7 +1,7 @@
 
 #Only works for Python2
 
-class OldStyle1:
+class OldStyle1: # $ Alert[py/slots-in-old-style-class]
 
     __slots__ = [ 'a', 'b' ]
 
@@ -12,7 +12,7 @@ def __init__(self, a, b):
 class OldStyle2:
 
     def __init__(self, x):
-        super().__init__(x)
+        super().__init__(x) # $ Alert[py/super-in-old-style]
 
 class NewStyle1(object):
 

python/ql/test/2/query-tests/Classes/new-style/property_old_style.py

@@ -5,6 +5,6 @@ class OldStyle:
     def __init__(self, x):
         self._x = x
 
-    @property
+    @property # $ Alert[py/property-in-old-style-class]
     def piosc(self):
         return self._x

python/ql/test/2/query-tests/Classes/undefined-attribute/MaybeUndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/MaybeUndefinedClassAttribute.ql
+query: Classes/MaybeUndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/undefined-attribute/UndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/UndefinedClassAttribute.ql
+query: Classes/UndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/CatchingBaseException.qlref

@@ -1 +1,2 @@
-Exceptions/CatchingBaseException.ql
+query: Exceptions/CatchingBaseException.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/EmptyExcept.qlref

@@ -1 +1,2 @@
-Exceptions/EmptyExcept.ql
+query: Exceptions/EmptyExcept.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IllegalExceptionHandlerType.qlref

@@ -1 +1,2 @@
-Exceptions/IllegalExceptionHandlerType.ql
+query: Exceptions/IllegalExceptionHandlerType.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IllegalRaise.qlref

@@ -1 +1,2 @@
-Exceptions/IllegalRaise.ql
+query: Exceptions/IllegalRaise.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IncorrectExceptOrder.qlref

@@ -1 +1,2 @@
-Exceptions/IncorrectExceptOrder.ql
+query: Exceptions/IncorrectExceptOrder.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/exceptions_test.py

@@ -14,4 +14,4 @@ def raise_tuple(cond):
         raise (Exception, "bananas", 17)
     else:
         #This is an error
-        raise (17, "bananas", Exception)
+        raise (17, "bananas", Exception) # $ Alert[py/illegal-raise]

python/ql/test/2/query-tests/Exceptions/generators/UnguardedNextInGenerator.qlref

@@ -1 +1,2 @@
-Exceptions/UnguardedNextInGenerator.ql
+query: Exceptions/UnguardedNextInGenerator.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/generators/test.py

@@ -2,12 +2,12 @@
 
 def bad1(it):
     while True:
-        yield next(it)
+        yield next(it) # $ Alert
 
 def bad2(seq):
     it = iter(seq)
     #Not OK as seq  may be empty
-    raise KeyError(next(it))
+    raise KeyError(next(it)) # $ Alert
     yield 0
 
 def ok1(seq):

python/ql/test/2/query-tests/Exceptions/raising/RaisingTuple.qlref

@@ -1 +1,2 @@
-Exceptions/RaisingTuple.ql
+query: Exceptions/RaisingTuple.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/raising/test.py

@@ -5,11 +5,11 @@ def ok():
 
 def bad1():
     ex = Exception, "message"
-    raise ex
+    raise ex # $ Alert
 
 def bad2():
-    raise (Exception, "message")
+    raise (Exception, "message") # $ Alert
 
 def bad3():
     ex = Exception, 
-    raise ex, "message"
+    raise ex, "message" # $ Alert

python/ql/test/2/query-tests/Expressions/TruncatedDivision.qlref

@@ -1 +1,2 @@
-Expressions/TruncatedDivision.ql
+query: Expressions/TruncatedDivision.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/TruncatedDivision_test.py

@@ -62,14 +62,14 @@ def halve(x):
 # This case is bad, and is a minimal obvious case that should be bad. It
 # SHOULD be found by the query.
 
-print(3 / 2)
+print(3 / 2) # $ Alert[py/truncated-division]
 
 
 
 # This case is bad. It uses indirect returns of integers through function calls
 # to produce the problem. I
 
-print(return_three() / return_two())
+print(return_three() / return_two()) # $ Alert[py/truncated-division]
 
 
 

python/ql/test/2/query-tests/Expressions/UseofApply.py

@@ -16,7 +16,7 @@ def foo():
 
   # This use of `apply` is a reference to the builtin function and so SHOULD be
   # caught by the query.
-  apply(foo, [1])
+  apply(foo, [1]) # $ Alert[py/use-of-apply]
 
 
 

python/ql/test/2/query-tests/Expressions/UseofApply.qlref

@@ -1 +1,2 @@
-Expressions/UseofApply.ql
+query: Expressions/UseofApply.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/UseofInput.qlref

@@ -1 +1,2 @@
-Expressions/UseofInput.ql
+query: Expressions/UseofInput.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/expressions_test.py

@@ -1,9 +1,9 @@
 def use_of_apply(func, args):
-    apply(func, args)
+    apply(func, args) # $ Alert[py/use-of-apply]
 
 
 def use_of_input():
-    return input() # NOT OK
+    return input() # $ Alert[py/use-of-input] # NOT OK
 
 
 def not_use_of_input():

python/ql/test/2/query-tests/Functions/DeprecatedSliceMethod.qlref

@@ -1 +1,2 @@
-Functions/DeprecatedSliceMethod.ql
+query: Functions/DeprecatedSliceMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/encoding_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/SyntaxError.qlref

@@ -1 +1,2 @@
-Imports/SyntaxError.ql
+query: Imports/SyntaxError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/bad_encoding.py

@@ -8,5 +8,5 @@
 # encoding:shift-jis
 
 def f():
-    print "Python の開発は、1990 年ごろから開始されています"
+    print "Python の開発は、1990 年ごろから開始されています" # $ Alert[py/encoding-error]
 """

python/ql/test/2/query-tests/Imports/syntax_error/nonsense.py

@@ -1,4 +1,4 @@
-`Twas brillig, and the slithy toves
+`Twas brillig, and the slithy toves # $ Alert[py/syntax-error]
   Did gyre and gimble in the wabe:
 All mimsy were the borogoves,
   And the mome raths outgrabe.

python/ql/test/2/query-tests/Lexical/OldOctalLiteral.qlref

@@ -1 +1,2 @@
-Lexical/OldOctalLiteral.ql
+query: Lexical/OldOctalLiteral.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Lexical/lexical_test.py

@@ -1,6 +1,6 @@
 
 #Bad Octal literal
-017
+017 # $ Alert
 #Good Octal literal
 0o17
 #Special case file permissions

python/ql/test/2/query-tests/Statements/ExecUsed.qlref

@@ -1 +1,2 @@
-Statements/ExecUsed.ql
+query: Statements/ExecUsed.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/IterableStringOrSequence.qlref

@@ -1 +1,2 @@
-Statements/IterableStringOrSequence.ql
+query: Statements/IterableStringOrSequence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/TopLevelPrint.qlref

@@ -1 +1,2 @@
-Statements/TopLevelPrint.ql
+query: Statements/TopLevelPrint.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/module.py

@@ -1,2 +1,2 @@
 #Top level prints in modules are bad
-print ("Side effect on import")
+print ("Side effect on import") # $ Alert[py/print-during-import]

python/ql/test/2/query-tests/Statements/statements_test.py

@@ -2,7 +2,7 @@
 
 
 def exec_used(val):
-    exec (val)
+    exec (val) # $ Alert[py/use-of-exec]
 
 #Top level print
 import module
@@ -18,7 +18,7 @@ def f(x):
         s = u"Hello World"
     else:
         s = [ u'Hello', u'World']
-    for thing in s:
+    for thing in s: # $ Alert[py/iteration-string-and-sequence]
         print (thing)
 
 import fake_six

python/ql/test/2/query-tests/Summary/LinesOfCode.qlref

@@ -1 +1 @@
-Summary/LinesOfCode.ql
+query: Summary/LinesOfCode.ql

python/ql/test/2/query-tests/Summary/LinesOfUserCode.qlref

@@ -1 +1 @@
-Summary/LinesOfUserCode.ql
+query: Summary/LinesOfUserCode.ql

python/ql/test/2/query-tests/Variables/LeakyComp/LeakyComp.qlref

@@ -1 +1,2 @@
-Variables/LeakingListComprehension.ql
+query: Variables/LeakingListComprehension.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/LeakyComp/test.py

@@ -2,12 +2,12 @@
 
 def undefined_in_3():
     [x for x in range(3)]
-    print(x)
+    print(x) # $ Alert
 
 def different_in_3():
     y = 10
     [y for y in range(3)]
-    print(y)
+    print(y) # $ Alert
 
 def ok():
     [z for z in range(4)]

python/ql/test/2/query-tests/Variables/undefined/UndefinedExport.py

@@ -1,6 +1,6 @@
 
 
-__all__ = [ "x", "y", "z", "module" ]
+__all__ = [ "x", "y", "z", "module" ] # $ Alert[py/undefined-export]
 
 x = 1
 if 0:

python/ql/test/2/query-tests/Variables/undefined/UndefinedExport.qlref

@@ -1 +1,2 @@
-Variables/UndefinedExport.ql
+query: Variables/UndefinedExport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/UndefinedGlobal.qlref

@@ -1 +1,2 @@
-Variables/UndefinedGlobal.ql
+query: Variables/UndefinedGlobal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/UninitializedLocal.qlref

@@ -1 +1,2 @@
-Variables/UninitializedLocal.ql
+query: Variables/UninitializedLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/package/__init__.py

@@ -1 +1 @@
-__all__ = [ "module", "not_exists" ]
+__all__ = [ "module", "not_exists" ] # $ Alert[py/undefined-export]

python/ql/test/3/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.qlref

@@ -1 +1,2 @@
-Classes/DefineEqualsWhenAddingAttributes.ql
+query: Classes/DefineEqualsWhenAddingAttributes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/equals-attr/test.py

@@ -9,7 +9,7 @@ class RedefineEquals:
     def __eq__(self, other):
         return other is "Tuesday"
 
-class C(RedefineEquals):
+class C(RedefineEquals): # $ Alert
 
     def __init__(self, args):
         self.a, self.b = args

python/ql/test/3/query-tests/Classes/inconsistent-mro/InconsistentMRO.qlref

@@ -1 +1,2 @@
-Classes/InconsistentMRO.ql
+query: Classes/InconsistentMRO.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/inconsistent-mro/inconsistent_mro.py

@@ -6,12 +6,12 @@ class X(object):
 class Y(X):
     pass
 
-class Z(X, Y):
+class Z(X, Y): # $ Alert
     pass
 
 class O:
     pass
 
 #This is OK in Python 2
-class N(object, O):
+class N(object, O): # $ Alert
     pass

python/ql/test/3/query-tests/Classes/undefined-attribute/MaybeUndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/MaybeUndefinedClassAttribute.ql
+query: Classes/MaybeUndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/undefined-attribute/UndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/UndefinedClassAttribute.ql
+query: Classes/UndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/WrongNameForArgumentInCall.qlref

@@ -1 +1,2 @@
-Expressions/WrongNameForArgumentInCall.ql
+query: Expressions/WrongNameForArgumentInCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/WrongNumberArgumentsInCall.qlref

@@ -1 +1,2 @@
-Expressions/WrongNumberArgumentsInCall.ql
+query: Expressions/WrongNumberArgumentsInCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/wrong_arguments.py

@@ -9,8 +9,8 @@ def f(a, *varargs, kw1, kw2="has-default"):
 f(1, 2, kw1=1, kw2=2)
 
 #Not OK
-f(1, 2, 3, kw1=1, kw3=3)
-f(1, 2, 3, kw3=3)
+f(1, 2, 3, kw1=1, kw3=3) # $ Alert[py/call/wrong-named-argument]
+f(1, 2, 3, kw3=3) # $ Alert[py/call/wrong-named-argument]
 
 
 #ODASA-5897
@@ -21,4 +21,4 @@ def ok():
     return analyze_member_access(msg, original=original, chk=chk)
 
 def bad():
-    return analyze_member_access(msg, original, chk=chk)
+    return analyze_member_access(msg, original, chk=chk) # $ Alert[py/call/wrong-arguments]

python/ql/test/3/query-tests/Expressions/Formatting/WrongNumberArgumentsForFormat.qlref

@@ -1 +1,2 @@
-Expressions/WrongNumberArgumentsForFormat.ql
+query: Expressions/WrongNumberArgumentsForFormat.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/TruncatedDivision/TruncatedDivision.qlref

@@ -1 +1,2 @@
-Expressions/TruncatedDivision.ql
+query: Expressions/TruncatedDivision.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql