| yuja |
| hg-reviewers |
This would make the checker more friendly for 3rd-party code. For example,
In remotefilelog/x.py, it may have:
from . import shallowutils
That could trigger "relative import of stdlib module" if
"remotefilelog" was installed in the system. If the module being checked
conflicts with the system module, it makes sense to not treat that module as
system module. This patch makes it so.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| tests/test-imports-checker.t | ||
|---|---|---|
| 128–140 | Good catch. Should be "shadowing". Will change. | |
| "from .." must be before "from .". | "from .." must be before "from .". | ||||
| * Imports from peer packages should use relative import (e.g. do not | * Imports from peer packages should use relative import (e.g. do not | ||||
| "import mercurial.foo" from a "mercurial.*" module). | "import mercurial.foo" from a "mercurial.*" module). | ||||
| * Symbols can only be imported from specific modules (see | * Symbols can only be imported from specific modules (see | ||||
| `allowsymbolimports`). For other modules, first import the module then | `allowsymbolimports`). For other modules, first import the module then | ||||
| assign the symbol to a module-level variable. In addition, these imports | assign the symbol to a module-level variable. In addition, these imports | ||||
| must be performed before other local imports. This rule only | must be performed before other local imports. This rule only | ||||
| applies to import statements outside of any blocks. | applies to import statements outside of any blocks. | ||||
| * Relative imports from the standard library are not allowed. | * Relative imports from the standard library are not allowed, unless that | ||||
| library is also a local module. | |||||
| * Certain modules must be aliased to alternate names to avoid aliasing | * Certain modules must be aliased to alternate names to avoid aliasing | ||||
| and readability problems. See `requirealias`. | and readability problems. See `requirealias`. | ||||
| """ | """ | ||||
| if not isinstance(module, str): | if not isinstance(module, str): | ||||
| module = module.decode('ascii') | module = module.decode('ascii') | ||||
| topmodule = module.split('.')[0] | topmodule = module.split('.')[0] | ||||
| fromlocal = fromlocalfunc(module, localmods) | fromlocal = fromlocalfunc(module, localmods) | ||||
| topname = fullname.split('.')[0] | topname = fullname.split('.')[0] | ||||
| if topname == topmodule: | if topname == topmodule: | ||||
| yield msg('import should be relative: %s', fullname) | yield msg('import should be relative: %s', fullname) | ||||
| # __future__ is special since it needs to come first and use | # __future__ is special since it needs to come first and use | ||||
| # symbol import. | # symbol import. | ||||
| if fullname != '__future__': | if fullname != '__future__': | ||||
| if not fullname or fullname in stdlib_modules: | if not fullname or ( | ||||
| fullname in stdlib_modules | |||||
| and fullname not in localmods | |||||
| and fullname + '.__init__' not in localmods): | |||||
| yield msg('relative import of stdlib module') | yield msg('relative import of stdlib module') | ||||
| else: | else: | ||||
| seenlocal = fullname | seenlocal = fullname | ||||
| # Direct symbol import is only allowed from certain modules and | # Direct symbol import is only allowed from certain modules and | ||||
| # must occur before non-symbol imports. | # must occur before non-symbol imports. | ||||
| found = fromlocal(node.module, node.level) | found = fromlocal(node.module, node.level) | ||||
| if found and found[2]: # node.module is a package | if found and found[2]: # node.module is a package | ||||
Shallow? Do you mean "allow"?