Fix regression with empty package names #4115
Conversation
| @@ -651,7 +651,7 @@ def visit_Import(self, n: ast3.Import) -> Import: | |||
| def visit_ImportFrom(self, n: ast3.ImportFrom) -> ImportBase: | |||
| assert n.level is not None | |||
| if len(n.names) == 1 and n.names[0].name == '*': | |||
| assert n.module is not None | |||
| assert n.module is not '' | |||
There was a problem hiding this comment.
Are you sure is not '' is the right thing to do? I'd expect n.module != ''.
| @@ -651,7 +651,7 @@ def visit_Import(self, n: ast3.Import) -> Import: | |||
| def visit_ImportFrom(self, n: ast3.ImportFrom) -> ImportBase: | |||
| assert n.level is not None | |||
| if len(n.names) == 1 and n.names[0].name == '*': | |||
| assert n.module is not None | |||
| assert n.module is not '' | |||
There was a problem hiding this comment.
This is actually not what I meant. The fix should at least replace n.module = None with n.module = ''.
There was a problem hiding this comment.
if n.module is None:
n.module = ''
Is this what you mean?
There was a problem hiding this comment.
Yes, but it may be more subtle than that. --strict-optional handling requires care, so I need to investigate this myself in any case.
There was a problem hiding this comment.
OK, it looks like you can write
mod = n.module if n.module is not None else ''
i = ImportAll(mod, n.level)Also please make the corresponding change in fastparse2.py and add tests (check that the import does not crash in both Python 2 and Python mode).
(I think this is something we should get into the next release, so it is better not to wait with this.)
There was a problem hiding this comment.
@matzipan Is there any progress on this? It is a crash so I don't want the fix to wait indefinitely.
There was a problem hiding this comment.
My new pipeline is failing on this, fix would be really appreciated.
|
Can you work around it by removing the toplevel __init__.py?
|
gvanrossum
changed the title
|
This needs a test, so other bugs won't cause similar regressions in the future without being caught. |
Fixes #4111