hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1618 from markshannon/python-refine-module-names

Browse Source 
Python refine module naming.
This commit is contained in:
Taus
2019-07-25 15:29:47 +02:00
committed by GitHub
parent 85a0566c43 90475fa7ef
commit 76fe36aa48
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
python/ql/src/semmle/python/Module.qll
View File

@@ -211,15 +211,17 @@ private predicate legalShortName(string name) {
*/
private predicate isPotentialSourcePackage(Folder f) {
f.getRelativePath() != "" and
(
exists(f.getFile("__init__.py"))
or
py_flags_versioned("options.respect_init", "False", _) and major_version() = 2
)
isPotentialPackage(f)
}
private predicate isPotentialPackage(Folder f) {
exists(f.getFile("__init__.py"))
or
py_flags_versioned("options.respect_init", "False", _) and major_version() = 2
}
private string moduleNameFromBase(Container file) {
file instanceof Folder and result = file.getBaseName()
isPotentialPackage(file) and result = file.getBaseName()
or
file instanceof File and result = file.getStem()
}
@@ -227,17 +229,16 @@ private string moduleNameFromBase(Container file) {
string moduleNameFromFile(Container file) {
exists(string basename |
basename = moduleNameFromBase(file) and
legalShortName(basename)
|
legalShortName(basename) and
result = moduleNameFromFile(file.getParent()) + "." + basename
or
isPotentialSourcePackage(file) and result = file.getStem() and
(not isPotentialSourcePackage(file.getParent()) or not legalShortName(file.getParent().getBaseName()))
or
result = file.getStem() and file.getParent() = file.getImportRoot()
or
result = file.getStem() and isStubRoot(file.getParent())
)
or
isPotentialSourcePackage(file) and result = file.getStem() and
(not isPotentialSourcePackage(file.getParent()) or not legalShortName(file.getParent().getBaseName()))
or
result = file.getStem() and file.getParent() = file.getImportRoot()
or
result = file.getStem() and isStubRoot(file.getParent())
}
private predicate isStubRoot(Folder f) {