Skip to content

gh-105069: Add a readline-like callable to the tokenizer to consume input iteratively #105070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 7 commits into from
May 30, 2023
Merged

gh-105069: Add a readline-like callable to the tokenizer to consume input iteratively #105070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7caac01
gh-105069: Add a readline-like callable to the tokenizer to consume i…
pablogsal May 29, 2023
8903d0d
fixup! gh-105069: Add a readline-like callable to the tokenizer to co…
pablogsal May 29, 2023
d370087
fixup! fixup! gh-105069: Add a readline-like callable to the tokenize…
pablogsal May 30, 2023
2d6f0a6
fixup! fixup! fixup! gh-105069: Add a readline-like callable to the t…
pablogsal May 30, 2023
0935371
fixup! fixup! fixup! fixup! gh-105069: Add a readline-like callable t…
pablogsal May 30, 2023
9990b7e
fixup! fixup! fixup! fixup! fixup! gh-105069: Add a readline-like cal…
pablogsal May 30, 2023
0598127
fixup! fixup! fixup! fixup! fixup! fixup! gh-105069: Add a readline-l…
pablogsal May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! fixup! gh-105069: Add a readline-like callable to the tokenize… 
…r to consume input iteratively
  • Loading branch information
@pablogsal
pablogsal committed May 30, 2023
commit d3700879709cedf193b4d190663c66ec22f21452
2 changes: 1 addition & 1 deletion Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2203,7 +2203,7 @@ def _signature_strip_non_python_syntax(signature):
add(string)
if (string == ','):
add(' ')
clean_signature = ''.join(text).strip()
Copy link
Copy Markdown
Member Author

@pablogsal pablogsal May 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is because for some reason the inspect module is relying on the fact that if lines yielded by the generator do not end in \n then they are concatenated together, which is wrong because the contract says "should yield one line at a time" so if the line doesn't end in newline we add one always.

clean_signature = ''.join(text).strip().replace("\n", "")
return clean_signature, self_parameter


Expand Down
2 changes: 1 addition & 1 deletion Parser/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ tok_underflow_file(struct tok_state *tok, int use_readline) {
tok->done = E_EOF;
return 0;
}
if (tok->readline == NULL && tok->inp[-1] != '\n') {
if (tok->inp[-1] != '\n') {
assert(tok->inp + 1 < tok->end);
/* Last line does not end in \n, fake one */
*tok->inp++ = '\n';
Expand Down