Skip to content

gh-104016: Fixed off by 1 error in f string tokenizer #104047

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
Merged
merged 9 commits into from
May 1, 2023
Merged

gh-104016: Fixed off by 1 error in f string tokenizer #104047

merged 9 commits into from
May 1, 2023

Conversation

jx124
Copy link
Contributor

@jx124 jx124 commented May 1, 2023 •
edited by bedevere-bot
Loading

@ghost
Copy link

ghost commented May 1, 2023 •
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@arhadthedev arhadthedev added the interpreter-core (Objects, Python, Grammar, and Parser dirs) label May 1, 2023
@Fidget-Spinner Fidget-Spinner added the type-crash A hard crash of the interpreter, possibly with a core dump label May 1, 2023
@Fidget-Spinner
Copy link
Member

DIsclaimer: This is my friend who I'm helping guide to contribute to CPython. I will thus exclude myself from approving this to prevent any conflict of interest which may arise.

jx124
jx124 commented May 1, 2023
View reviewed changes
@pablogsal
Copy link
Member

pablogsal commented May 1, 2023 •
edited
Loading

I was actually preparing a fix for this problem. I think the correct approach here is to separate the two limits. I will update your PR with my approach and we can land it afterwards as we need this fix to build upon for other fixes. In other circumstances we could iterate together but beta freeze is too close 😅

@pablogsal pablogsal force-pushed the fix-issue-104016 branch from 5188666 to d3a2fca Compare May 1, 2023 18:50
@pablogsal pablogsal enabled auto-merge (squash) May 1, 2023 18:53
@pablogsal
Copy link
Member

Great job @jx124 🚀

@pablogsal pablogsal merged commit 5078eed into python:main May 1, 2023
@brettcannon
Copy link
Member

@pablogsal ☝️ blowing out memory on WASI.

@pablogsal
Copy link
Member

@pablogsal point_up blowing out memory on WASI.

On it

carljm added a commit to carljm/cpython that referenced this pull request May 1, 2023
@carljm
Merge branch 'main' into inlinecomp2
1274e2b 
* main: (463 commits)
  pythongh-104057: Fix direct invocation of test_super (python#104064)
  pythongh-87092: Expose assembler to unit tests (python#103988)
  pythongh-97696: asyncio eager tasks factory (python#102853)
  pythongh-84436: Immortalize in _PyStructSequence_InitBuiltinWithFlags() (pythongh-104054)
  pythongh-104057: Fix direct invocation of test_module (pythonGH-104059)
  pythongh-100458: Clarify Enum.__format__() change of mixed-in types in the whatsnew/3.11.rst (pythonGH-100387)
  pythongh-104018: disallow "z" format specifier in %-format of byte strings (pythonGH-104033)
  pythongh-104016: Fixed off by 1 error in f string tokenizer (python#104047)
  pythonGH-103629: Update Unpack's repr in compliance with PEP 692 (python#104048)
  pythongh-102799: replace sys.exc_info by sys.exception in inspect and traceback modules (python#104032)
  Fix typo in "expected" word in few source files (python#104034)
  pythongh-103824: fix use-after-free error in Parser/tokenizer.c (python#103993)
  pythongh-104035: Do not ignore user-defined `__{get,set}state__` in slotted frozen dataclasses (python#104041)
  pythongh-104028: Reduce object creation while calling callback function from gc (pythongh-104030)
  pythongh-104036: Fix direct invocation of test_typing (python#104037)
  pythongh-102213: Optimize the performance of `__getattr__` (pythonGH-103761)
  pythongh-103895: Improve how invalid `Exception.__notes__` are displayed (python#103897)
  Adjust expression from `==` to `!=` in alignment with the meaning of the paragraph. (pythonGH-104021)
  pythongh-88496: Fix IDLE test hang on macOS (python#104025)
  Improve int test coverage (python#104024)
  ...
@arhadthedev
Copy link
Member

For the record: the WASM test got fixed gh-104071.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal pablogsal approved these changes

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

Assignees
No one assigned
Labels
interpreter-core (Objects, Python, Grammar, and Parser dirs) skip news type-crash A hard crash of the interpreter, possibly with a core dump
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jx124 @Fidget-Spinner @pablogsal @brettcannon @arhadthedev