Merge pull request github#3233 from RasmusWL/python-use-getAbsolutePath

Approved by BekaValentine

Author: semmle-qlci

python/ql/src/external/CodeDuplication.qll

@@ -66,7 +66,7 @@ class Copy extends @duplication_or_similarity {
     predicate hasLocationInfo(
         string filepath, int startline, int startcolumn, int endline, int endcolumn
     ) {
-        sourceFile().getName() = filepath and
+        sourceFile().getAbsolutePath() = filepath and
         startline = sourceStartLine() and
         startcolumn = sourceStartColumn() and
         endline = sourceEndLine() and

python/ql/src/external/DefectFilter.qll

@@ -26,7 +26,7 @@ class DefectResult extends int {
 
     /** Gets the file in which this query result was reported. */
     File getFile() {
-        exists(string path | defectResults(this, _, path, _, _, _, _, _) and result.getName() = path)
+        exists(string path | defectResults(this, _, path, _, _, _, _, _) and result.getAbsolutePath() = path)
     }
 
     /** Gets the file path in which this query result was reported. */
@@ -54,7 +54,7 @@ class DefectResult extends int {
     /** Gets the URL corresponding to the ___location of this query result. */
     string getURL() {
         result =
-            "file://" + getFile().getName() + ":" + getStartLine() + ":" + getStartColumn() + ":" +
+            "file://" + getFile().getAbsolutePath() + ":" + getStartLine() + ":" + getStartColumn() + ":" +
                 getEndLine() + ":" + getEndColumn()
     }
 }

python/ql/src/external/VCS.qll

@@ -23,7 +23,7 @@ class Commit extends @svnentry {
     string getMessage() { svnentrymsg(this, result) }
 
     string getAnAffectedFilePath(string action) {
-        exists(File rawFile | svnaffectedfiles(this, rawFile, action) | result = rawFile.getName())
+        exists(File rawFile | svnaffectedfiles(this, rawFile, action) | result = rawFile.getAbsolutePath())
     }
 
     string getAnAffectedFilePath() { result = getAnAffectedFilePath(_) }

python/ql/src/semmle/python/filters/GeneratedCode.qll

@@ -170,7 +170,7 @@ string from_mako_import(Module m) {
 /** File generated by Google's protobuf tool. */
 class ProtobufGeneratedFile extends SpecificGeneratedFile {
     ProtobufGeneratedFile() {
-        this.getName().regexpMatch(".*_pb2?.py") and
+        this.getAbsolutePath().regexpMatch(".*_pb2?.py") and
         exists(Module m | m.getFile() = this |
             exists(ImportExpr imp | imp.getEnclosingModule() = m |
                 imp.getImportedModuleName() = "google.net.proto2.python.public"