Merge pull request #10729 from erik-krogh/py-last-msg

Py: fix some more style-guide violations in the alert-messages

Author: erik-krogh

python/ql/src/Classes/MaybeUndefinedClassAttribute.ql

@@ -39,5 +39,5 @@ where
   sa.getName() = a.getName()
 select a,
   "Attribute '" + a.getName() +
-    "' is not defined in the class body nor in the __init__() method, but it is defined $@", sa,
+    "' is not defined in the class body nor in the __init__() method, but it is defined $@.", sa,
   "here"

python/ql/src/Classes/SlotsInOldStyleClass.ql

@@ -15,4 +15,5 @@ import python
 
 from ClassObject c
 where not c.isNewStyle() and c.declaresAttribute("__slots__") and not c.failedInference()
-select c, "Using __slots__ in an old style class just creates a class attribute called '__slots__'"
+select c,
+  "Using '__slots__' in an old style class just creates a class attribute called '__slots__'."

python/ql/src/Classes/SubclassShadowing.ql

@@ -42,5 +42,5 @@ predicate shadowed_by_super_class(
 from ClassObject c, ClassObject supercls, Assign assign, FunctionObject shadowed
 where shadowed_by_super_class(c, supercls, assign, shadowed)
 select shadowed.getOrigin(),
-  "Method " + shadowed.getName() + " is shadowed by $@ in super class '" + supercls.getName() + "'.",
-  assign, "an attribute"
+  "Method " + shadowed.getName() + " is shadowed by an $@ in super class '" + supercls.getName() +
+    "'.", assign, "attribute"

python/ql/src/Classes/SuperInOldStyleClass.ql

@@ -24,4 +24,4 @@ predicate uses_of_super_in_old_style_class(Call s) {
 
 from Call c
 where uses_of_super_in_old_style_class(c)
-select c, "super() will not work in old-style classes"
+select c, "'super()' will not work in old-style classes."

python/ql/src/Classes/UndefinedClassAttribute.ql

@@ -30,4 +30,4 @@ predicate report_undefined_class_attribute(Attribute a, ClassObject c, string na
 
 from Attribute a, ClassObject c, string name
 where report_undefined_class_attribute(a, c, name)
-select a, "Attribute '" + name + "' is not defined in either the class body or in any method"
+select a, "Attribute '" + name + "' is not defined in either the class body or in any method."

python/ql/src/Exceptions/RaisingTuple.ql

@@ -21,5 +21,5 @@ where
   major_version() = 2
 /* Raising a tuple is a type error in Python 3, so is handled by the IllegalRaise query. */
 select r,
-  "Raising $@ will result in the first element (recursively) being raised and all other elements being discarded.",
-  origin, "a tuple"
+  "Raising a $@ will result in the first element (recursively) being raised and all other elements being discarded.",
+  origin, "tuple"

python/ql/src/Exceptions/UnguardedNextInGenerator.ql

@@ -73,4 +73,4 @@ where
   // However, we do not know the minor version of the analyzed code (only of the extractor),
   // so we only alert on Python 2.
   major_version() = 2
-select call, "Call to next() in a generator"
+select call, "Call to 'next()' in a generator."

python/ql/src/Expressions/Comparisons/UselessComparisonTest.ql

@@ -48,4 +48,4 @@ private predicate useless_test_ast(AstNode comp, AstNode previous, boolean isTru
 from Expr test, Expr other, boolean isTrue
 where
   useless_test_ast(test, other, isTrue) and not useless_test_ast(test.getAChildNode+(), other, _)
-select test, "Test is always " + isTrue + ", because of $@", other, "this condition"
+select test, "Test is always " + isTrue + ", because of $@.", other, "this condition"

python/ql/src/Functions/DeprecatedSliceMethod.ql

@@ -21,4 +21,4 @@ where
   not f.isOverridingMethod() and
   slice_method_name(meth) and
   f.getName() = meth
-select f, meth + " method has been deprecated since Python 2.0"
+select f, meth + " method has been deprecated since Python 2.0."

python/ql/src/Functions/ModificationOfParameterWithDefault.ql

@@ -19,5 +19,5 @@ from
   ModificationOfParameterWithDefault::Configuration config, DataFlow::PathNode source,
   DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
-select sink.getNode(), source, sink, "This expression mutates $@.", source.getNode(),
-  "a default value"
+select sink.getNode(), source, sink, "This expression mutates a $@.", source.getNode(),
+  "default value"