gh-137477: Fix inspect.getblock() for generator expressions #137488
Conversation
This fixes also inspect.getsourcelines() and inspect.getsource().
Lib/inspect.py
Outdated
| if token == "lambda": | ||
| self.islambda = True | ||
| self.started = True | ||
| else: | ||
| self.islambda = True |
There was a problem hiding this comment.
Could you explain this part a bit to me? What's in the else case? Why is islambda set? I was a bit confused (without testing too much into it) when I read the code because I thought this is definitely not a lambda here.
There was a problem hiding this comment.
For def and class we search to the end of the block. For lambda and generator expressions we search to the end of the logical line. self.islambda is used to distinguish between these modes. We could rename it, but this will increase the size of the diff and may break user code that uses this private class, so I leave it for a time.
Although the code can be simplified.
|
@gaogaotiantian, is it fine to you? |
|
Sorry I've been travelling the world so not super responsive. Even though I always agree a minimum change is preferred, but This could raise some minor backwards compatibility issues, I agree. I think it can be ignored because it's a non-documented variable in a private class. Another way is to add another variable If the breaking change is really a huge concern to you, I think I can accept a backport with this change, and an immediate rename for |
|
What name would be good? Anyway, I want to refactor this code in main. There is no justification to use a class -- it may be a simple function taking a stream of tokens. |
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14. |
…thonGH-137488) This fixes also inspect.getsourcelines() and inspect.getsource(). (cherry picked from commit eae9d7d) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
Sorry, @serhiy-storchaka, I could not cleanly backport this to |
|
GH-137993 is a backport of this pull request to the 3.14 branch. |
|
Thank you for review, @gaogaotiantian! |
…ons (pythonGH-137488) This fixes also inspect.getsourcelines() and inspect.getsource(). (cherry picked from commit eae9d7d) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
|
GH-137995 is a backport of this pull request to the 3.13 branch. |
This fixes also inspect.getsourcelines() and inspect.getsource().
inspect.getsourcelines()mishandles multi-line generator expressions #137477