Skip to content

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

Merged
pablogsal merged 3 commits into
python:mainfrom
pablogsal:main
May 24, 2023
Merged

gh-104825: Remove implicit newline in the line attribute in tokens emitted in the tokenize module#104846
pablogsal merged 3 commits into
python:mainfrom
pablogsal:main

Conversation

@pablogsal

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

Copy link
Copy Markdown
Member

@bedevere-botbedevere-bot mentioned this pull request May 24, 2023
Closed
@pablogsal

pablogsal commented May 24, 2023

Copy link
Copy Markdown
MemberAuthor

CC: @mgmacias95

pablogsal
pablogsal commented May 24, 2023
View reviewed changes
Comment threadLib/tokenize.py Outdated
lysnikolaou
lysnikolaou approved these changes May 24, 2023
View reviewed changes

@lysnikolaoulysnikolaou left a comment

Copy link
Copy Markdown
Member

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:mainMay 24, 2023
@pablogsalpablogsal added the needs backport to 3.12 only security fixes label May 24, 2023
@miss-islington

miss-islington commented May 24, 2023

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented May 24, 2023

Copy link
Copy Markdown
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

bedevere-bot commented May 24, 2023

Copy link
Copy Markdown

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

@bedevere-botbedevere-bot removed the needs backport to 3.12 only 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)
@JelleZijlstraJelleZijlstra mentioned this pull request May 24, 2023
Merged
@terryjreedyterryjreedy added the needs backport to 3.11 only security fixes label May 24, 2023
@miss-islington

miss-islington commented May 24, 2023

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented May 24, 2023

Copy link
Copy Markdown
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

terryjreedy commented May 24, 2023•
edited
Loading

Copy link
Copy Markdown
Member

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-aaslanderlend-aasland mentioned this pull request Jun 6, 2023
Closed
@ZeroIntensityZeroIntensity removed the needs backport to 3.11 only security fixes label Feb 17, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lysnikolaoulysnikolaoulysnikolaou approved these changes
@terryjreedyterryjreedyAwaiting requested review from terryjreedyterryjreedy is a code owner

Assignees

@pablogsalpablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@pablogsal@miss-islington@bedevere-bot@terryjreedy@lysnikolaou@ZeroIntensity