Skip to content

generate_tokens(readline) must return bytes #3372

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
JelleZijlstra merged 1 commit into from
Oct 16, 2019
Merged

generate_tokens(readline) must return bytes #3372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion stdlib/3/tokenize.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Untokenizer:
def untokenize(iterable: Iterable[_Token]) -> Any: ...
def detect_encoding(readline: Callable[[], bytes]) -> Tuple[str, Sequence[bytes]]: ...
def tokenize(readline: Callable[[], bytes]) -> Generator[TokenInfo, None, None]: ...
def generate_tokens(readline: Callable[[], str]) -> Generator[TokenInfo, None, None]: ...
def generate_tokens(readline: Callable[[], bytes]) -> Generator[TokenInfo, None, None]: ... # undocumented
Copy link
Copy Markdown
Contributor

@blueyed blueyed Nov 22, 2019

Choose a reason for hiding this comment

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

That's incorrect, isn't it?
https://github.com/python/cpython/blob/825358ab80d0e17e287c1e36a91dece0a97cb219/Lib/tokenize.py#L612-L618

Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra Nov 22, 2019

Choose a reason for hiding this comment

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

Yes, confirmed in shell on 3.6. @srittau what was the basis for your change?

Copy link
Copy Markdown
Contributor

@blueyed blueyed Nov 22, 2019

Choose a reason for hiding this comment

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

I've noticed that there are difference with py27 in this regard, so maybe it got confused?

Copy link
Copy Markdown
Collaborator Author

@srittau srittau Nov 23, 2019

Choose a reason for hiding this comment

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

No idea why I thought readline() should return bytes or why I even stumbled over this. I probably misread _tokenize().


if sys.version_info >= (3, 6):
from os import PathLike
Expand Down