Merge pull request #1440 from markshannon/python-sanity-improvements

taus-semmle · web-flow · commit 635de7cbe900 · 2019-06-13T14:59:43.000+02:00
Python sanity improvements
diff --git a/python/ql/src/semmle/python/Module.qll b/python/ql/src/semmle/python/Module.qll
@@ -9,9 +9,13 @@ class Module extends Module_, Scope, AstNode {
     override string toString() {
         result = this.getKind() + " " + this.getName()
         or
-        /* No name is defined, which means that this is not on an import path. So it must be a script */
+        /* No name is defined, which means that this module is not on an import path. So it must be a script */
         not exists(this.getName()) and not this.isPackage() and
         result = "Script " + this.getFile().getShortName()
+        or
+        /* Package missing name, so just use the path instead */
+        not exists(this.getName()) and this.isPackage() and
+        result = "Package at "  + this.getPath().getAbsolutePath()
     }
 
     /** This method will be deprecated in the next release. Please use `getEnclosingScope()` instead.
diff --git a/python/ql/src/semmle/python/types/ModuleObject.qll b/python/ql/src/semmle/python/types/ModuleObject.qll
@@ -32,6 +32,9 @@ abstract class ModuleObject extends Object {
 
     override string toString() {
         result = "Module " + this.getName()
+        or
+        not exists(this.getName()) and
+        result = this.getModule().toString()
     }
 
     /** Gets the named attribute of this module. Using attributeRefersTo() instead
diff --git a/python/ql/test/library-tests/ControlFlow/PointsToSupport/UseFromDefinition.ql b/python/ql/test/library-tests/ControlFlow/PointsToSupport/UseFromDefinition.ql
@@ -1,9 +1,3 @@
-/**
- * @name UseFromDefinition
- * @description Insert description here...
- * @kind table
- * @problem.severity warning
- */
 
 import python
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ abstract class ModuleObject extends Object {`
`32`	`32`
`33`	`33`	`override string toString() {`
`34`	`34`	`result = "Module " + this.getName()`
	`35`	`+ or`
	`36`	`+ not exists(this.getName()) and`
	`37`	`+ result = this.getModule().toString()`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`/** Gets the named attribute of this module. Using attributeRefersTo() instead`