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.

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

Jump to bottom

gh-104825: Remove implicit newline in the line attribute in tokens emitted in the tokenize module #104846

Merged
merged 3 commits into from
May 24, 2023
Merged

gh-104825: Remove implicit newline in the line attribute in tokens emitted in the tokenize module #104846

merged 3 commits into from
May 24, 2023

Conversation

pablogsal
Copy link
Member

@pablogsal pablogsal commented May 24, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request May 24, 2023
Closed
@pablogsal
Copy link
Member Author

CC: @mgmacias95

pablogsal
pablogsal commented May 24, 2023
View reviewed changes
Lib/tokenize.py Outdated Show resolved Hide resolved
lysnikolaou
lysnikolaou approved these changes May 24, 2023
View reviewed changes
Copy link
Contributor

@lysnikolaou lysnikolaou left a comment

Choose a reason for hiding this comment

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

LGTM!

@pablogsal pablogsal enabled auto-merge (squash) May 24, 2023 09:14
@pablogsal pablogsal merged commit c8cf9b4 into python:main May 24, 2023
@pablogsal pablogsal added the needs backport to 3.12 bug and security fixes label May 24, 2023
@miss-islington
Copy link
Contributor

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @pablogsal, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c8cf9b42eb2bfbd4c3e708ec28d32430248a1d7a 3.12

pablogsal added a commit to pablogsal/cpython that referenced this pull request May 24, 2023
@pablogsal
[3.12] pythongh-104825: Remove implicit newline in the line attribute…
c09fbfa 
… in tokens emitted in the tokenize module (pythonGH-104846).

(cherry picked from commit c8cf9b4)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
@bedevere-bot
Copy link

GH-104850 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label May 24, 2023
pablogsal added a commit that referenced this pull request May 24, 2023
@pablogsal
[3.12] gh-104825: Remove implicit newline in the line attribute in to…
3d2ed89 
…kens emitted in the tokenize module (GH-104846). (#104850)

(cherry picked from commit c8cf9b4)
@JelleZijlstra JelleZijlstra mentioned this pull request May 24, 2023
Merged
@terryjreedy terryjreedy added the needs backport to 3.11 only security fixes label May 24, 2023
@miss-islington
Copy link
Contributor

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @pablogsal, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c8cf9b42eb2bfbd4c3e708ec28d32430248a1d7a 3.11

@terryjreedy
Copy link
Member

terryjreedy commented May 24, 2023 •
edited
Loading

I backported the test to 3.11 so I thought it would need this fix, but now I realize that 3.11 still has the old tokenizer, for which the patch is correct as it (tested). Sorry for the noise. But see #104850 (comment)

@erlend-aasland erlend-aasland mentioned this pull request Jun 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lysnikolaou lysnikolaou lysnikolaou approved these changes

@terryjreedy terryjreedy Awaiting requested review from terryjreedy terryjreedy is a code owner

Assignees

@pablogsal pablogsal

Labels
needs backport to 3.11 only security fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@pablogsal @miss-islington @bedevere-bot @terryjreedy @lysnikolaou