Skip to content

[3.13] gh-151464: exclude '<>' token from tokenize output (GH-154854) - #158191

Merged
pablogsal merged 1 commit into
python:3.13from
pablogsal:gh-154854-3.13
Sep 25, 2026
Merged

pablogsal merged 1 commit into
python:3.13from
pablogsal:gh-154854-3.13

Conversation

@pablogsal

@pablogsal pablogsal commented Sep 25, 2026 •

Copy link
Copy Markdown
Member

Manual backport of #154854 to 3.13. The comparison grammar and future-import helper differ from main, so this applies the tokenizer fix to those 3.13 paths and regenerates the parser. The tokenizer, syntax, Barry, and future-import suites pass locally.

…onGH-154854)

* pythongh-151464: exclude '<>' token from tokenize output

Was:
```
$ echo '1 <> 2' | python -m tokenize
1,0-1,1:            NUMBER         '1'
1,2-1,4:            OP             '<>'
1,5-1,6:            NUMBER         '2'
1,6-1,7:            NEWLINE        '\n'
2,0-2,0:            ENDMARKER      ''
```

Now (regardless on ``__future__.barry_as_FLUFL`` import):
```
$ echo '1 <> 2' | ./python -m tokenize
1,0-1,1:            NUMBER         '1'
1,2-1,3:            OP             '<'
1,3-1,4:            OP             '>'
1,5-1,6:            NUMBER         '2'
1,6-1,7:            NEWLINE        '\n'
2,0-2,0:            ENDMARKER      ''
```
in accordance with the Grammar:
https://docs.python.org/3.14/reference/lexical_analysis.html#operators-and-delimiters

Also adds a custom error message for ``<>`` ("not equal" in Pascal
and Python 2).

* +1

* address review: lowercase and move invalid rule

* address review: news

* address review: move test_guido_as_bdfl_ineq_tokens()

* address review: revert _PyTokenizer_From* changes

* + revert unrelated change

* address review: remove whatsnew entry

(cherry picked from commit 198bc76)
@pablogsal
pablogsal enabled auto-merge (squash) September 25, 2026 19:02
@pablogsal
pablogsal merged commit bc5ec7e into python:3.13 Sep 25, 2026
43 checks passed
@pablogsal
pablogsal deleted the gh-154854-3.13 branch September 25, 2026 19:20
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.

2 participants