Python: Fix (upcoming) deprecation compiler-warnings

RasmusWL · RasmusWL · commit 32c8dd0491f7 · 2020-05-25T11:05:30.000+02:00
In a near-future release overriding a deprecated predicate without making as deprecated would give a compiler warning. Not fixing the XML one. [I can see that this shouldn't be reported anymore](#3520 (comment)), and it's not safe to remove since it was only marked as deprecated in e6425bb.
diff --git a/python/ql/src/semmle/python/Exprs.qll b/python/ql/src/semmle/python/Exprs.qll
@@ -597,7 +597,7 @@ class StrConst extends Str_, ImmutableLiteral {
         this.getEnclosingModule().hasFromFuture("unicode_literals")
     }
 
-    override string strValue() { result = this.getS() }
+    deprecated override string strValue() { result = this.getS() }
 
     override Expr getASubExpression() { none() }
 
diff --git a/python/ql/src/semmle/python/types/ModuleObject.qll b/python/ql/src/semmle/python/types/ModuleObject.qll
@@ -118,7 +118,7 @@ class BuiltinModuleObject extends ModuleObject {
 
     override predicate hasAttribute(string name) { exists(this.asBuiltin().getMember(name)) }
 
-    override predicate exportsComplete() { any() }
+    deprecated override predicate exportsComplete() { any() }
 }
 
 class PythonModuleObject extends ModuleObject {
@@ -132,7 +132,7 @@ class PythonModuleObject extends ModuleObject {
 
     override Container getPath() { result = this.getModule().getFile() }
 
-    override predicate exportsComplete() {
+    deprecated override predicate exportsComplete() {
         exists(Module m | m = this.getModule() |
             not exists(Call modify, Attribute attr, GlobalVariable all |
                 modify.getScope() = m and
@@ -196,7 +196,7 @@ class PackageObject extends ModuleObject {
         )
     }
 
-    override predicate exportsComplete() {
+    deprecated override predicate exportsComplete() {
         not exists(this.getInitModule())
         or
         this.getInitModule().exportsComplete()

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ class StrConst extends Str_, ImmutableLiteral {`
`597`	`597`	`this.getEnclosingModule().hasFromFuture("unicode_literals")`
`598`	`598`	`}`
`599`	`599`
`600`		`- override string strValue() { result = this.getS() }`
	`600`	`+ deprecated override string strValue() { result = this.getS() }`
`601`	`601`
`602`	`602`	`override Expr getASubExpression() { none() }`
`603`	`603`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class BuiltinModuleObject extends ModuleObject {`
`118`	`118`
`119`	`119`	`override predicate hasAttribute(string name) { exists(this.asBuiltin().getMember(name)) }`
`120`	`120`
`121`		`- override predicate exportsComplete() { any() }`
	`121`	`+ deprecated override predicate exportsComplete() { any() }`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`class PythonModuleObject extends ModuleObject {`
`@@ -132,7 +132,7 @@ class PythonModuleObject extends ModuleObject {`
`132`	`132`
`133`	`133`	`override Container getPath() { result = this.getModule().getFile() }`
`134`	`134`
`135`		`- override predicate exportsComplete() {`
	`135`	`+ deprecated override predicate exportsComplete() {`
`136`	`136`	`exists(Module m \| m = this.getModule() \|`
`137`	`137`	`not exists(Call modify, Attribute attr, GlobalVariable all \|`
`138`	`138`	`modify.getScope() = m and`
`@@ -196,7 +196,7 @@ class PackageObject extends ModuleObject {`
`196`	`196`	`)`
`197`	`197`	`}`
`198`	`198`
`199`		`- override predicate exportsComplete() {`
	`199`	`+ deprecated override predicate exportsComplete() {`
`200`	`200`	`not exists(this.getInitModule())`
`201`	`201`	`or`
`202`	`202`	`this.getInitModule().exportsComplete()`