Skip to content
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.

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

Remove py2 workarounds 1/2 #12110

Merged
merged 6 commits into from Feb 2, 2020
Merged

Conversation

terrdavis
Copy link
Contributor

@terrdavis terrdavis commented Feb 1, 2020

Breaking up #12092, per discussion.

generate_tokens = tokenize.generate_tokens
except AttributeError: # Python 3
generate_tokens = tokenize.tokenize
generate_tokens = tokenize.tokenize
Copy link
Member

@Carreau Carreau Feb 1, 2020

Choose a reason for hiding this comment

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

The comments appear to be wrong, generate_tokens = tokenize.generate_tokens work on Python 3; and this is likely the cause for the test failures.

It looks like the try/except comments were wrong and generate_tokens is available on Py3
@Carreau Carreau merged commit 6b91afe into ipython:master Feb 2, 2020
2 checks passed
@Carreau Carreau added this to the 7.13 milestone Feb 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants