Merge pull request #14591 from RasmusWL/minor-stringpool-improvement

RasmusWL · web-flow · commit f6ae7523b5c2 · 2023-11-06T13:13:27.000+01:00
Python: Minor cleanup for string pool interaction
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/ImportResolution.qll b/python/ql/lib/semmle/python/dataflow/new/internal/ImportResolution.qll
@@ -227,7 +227,7 @@ module ImportResolution {
    */
   pragma[inline]
   private Module getModuleFromName(string name) {
-    isPreferredModuleForName(result.getFile(), name + ["", ".__init__"])
+    isPreferredModuleForName(result.getFile(), [name, name + ".__init__"])
   }
 
   /** Gets the module from which attributes are imported by `i`. */

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ module ImportResolution {`
`227`	`227`	`*/`
`228`	`228`	`pragma[inline]`
`229`	`229`	`private Module getModuleFromName(string name) {`
`230`		`- isPreferredModuleForName(result.getFile(), name + ["", ".__init__"])`
	`230`	`+ isPreferredModuleForName(result.getFile(), [name, name + ".__init__"])`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	/** Gets the module from which attributes are imported by `i`. */