Namespaces refactor #5686
Merged
Namespaces refactor #5686
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
September 26, 2018 12:12
…python_executable arg
ilevkivskyi
approved these changes
Sep 27, 2018
| return dirs | ||
|
|
||
| def find_module(self, id: str, search_paths: SearchPaths, | ||
| python_executable: Optional[str]) -> Optional[str]: |
There was a problem hiding this comment.
FWIW python_executable is never actually used by find_module, _find_module, and find_module_recursive, it just gets passed around but I didn't find a place where it is used. As I understand, all the info is stored already in search_paths that are calculated using the executable.
There was a problem hiding this comment.
Yes, that's why I removed it from their signatures in the refactor.
mypy/modulefinder.py
Outdated
| self.path = path # File where it's found (e.g. 'xxx/yyy/foo/bar.py') | ||
| self.module = module or '__main__' # Module name (e.g. 'foo.bar') | ||
| self.text = text # Source code, if initially supplied, else None | ||
| self.base_dir = base_dir # Directory where the package is rooted (e.g. 'xxx/yyy') |
There was a problem hiding this comment.
Remove extra spaces before this comment?
TV4Fun
pushed a commit
to TV4Fun/mypy
that referenced
this pull request
Oct 4, 2018
In preparation of working on PEP 420 namespaces, here's some initial work. IT DOES NOT IMPLEMENT NAMESPACES YET. What it does do: - Move nearly 400 lines from build.py to a new file, `modulefinder.py`. This includes `SearchPaths`, `BuildSource`, `FindModuleCache`, `mypy-path`, `default_lib_path`, `get_site_packages` (now without underscore!), and `compute_search_paths`. - Slight refactor to `FindModuleCache` so that the `search_paths` are passed to the constructor instead of to `find_module`. - Removed `search_paths` and `python_executable` from the signature of `find_module` and `find_modules_recursive`, and also from the cache key (**this may be the most controversial change** -- it's not just a refactor). - Add a (non-functional) `--namespace-packages` flag to `main.py` and add new global config option `namespace_packages`. (These are not used yet.) I'm presenting this as a separate PR because it's a significant refactor without change of functionality -- everything I plan to do after this will mostly tweak the code in `modulefinder.py`. It seems fairer to reviewers to be able to review this massive code move without having to worry too much about "what else changed". (Note that this is part of my general plan to move functionality out of `build.py` -- that file is (still) way too bulky.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In preparation of working on PEP 420 namespaces, here's some initial work. IT DOES NOT IMPLEMENT NAMESPACES YET. What it does do:
modulefinder.py. This includesSearchPaths,BuildSource,FindModuleCache,mypy-path,default_lib_path,get_site_packages(now without underscore!), andcompute_search_paths.FindModuleCacheso that thesearch_pathsare passed to the constructor instead of tofind_module.search_pathsandpython_executablefrom the signature offind_moduleandfind_modules_recursive, and also from the cache key (this may be the most controversial change -- it's not just a refactor).--namespace-packagesflag tomain.pyand add new global config optionnamespace_packages. (These are not used yet.)I'm presenting this as a separate PR because it's a significant refactor without change of functionality -- everything I plan to do after this will mostly tweak the code in
modulefinder.py. It seems fairer to reviewers to be able to review this massive code move without having to worry too much about "what else changed".(Note that this is part of my general plan to move functionality out of
build.py-- that file is (still) way too bulky.)