Skip to content

gh-151464: exclude '<>' token from tokenize output #154854

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

Merged
pablogsal merged 14 commits into from
Sep 25, 2026
Merged

gh-151464: exclude '<>' token from tokenize output #154854

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
73f2d90
gh-151464: exclude '<>' token from tokenize output
skirpichev Jul 29, 2026
c53a17f
+1
skirpichev Jul 29, 2026
e525b8f
Merge branch 'master' into save-python/151464
skirpichev Aug 10, 2026
f4dd644
address review: lowercase and move invalid rule
skirpichev Aug 11, 2026
ba5843d
address review: news
skirpichev Aug 11, 2026
9ea138f
address review: move test_guido_as_bdfl_ineq_tokens()
skirpichev Aug 11, 2026
3f9c57e
address review: revert _PyTokenizer_From* changes
skirpichev Aug 11, 2026
a966092
Merge branch 'main' into save-python/151464
skirpichev Aug 21, 2026
d81b19c
Merge branch 'master' into save-python/151464
skirpichev Sep 1, 2026
3ff8480
+ revert unrelated change
skirpichev Sep 1, 2026
d134772
Merge branch 'master' into save-python/151464
skirpichev Sep 15, 2026
e1fc4cc
Merge branch 'master' into save-python/151464
skirpichev Sep 19, 2026
8b5f1e4
address review: remove whatsnew entry
skirpichev Sep 19, 2026
76b2ee6
Merge branch 'master' into save-python/151464
skirpichev Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
+1
  • Loading branch information
@skirpichev
skirpichev committed Jul 29, 2026
commit c53a17ff508989d9f644d119b5d3fa6ea44b2e71
5 changes: 3 additions & 2 deletions Parser/pegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,9 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena
PyCompilerFlags *flags, int *errcode,
PyObject **interactive_src, PyArena *arena)
{
struct tok_state *tok = _PyTokenizer_FromFile(fp, enc, ps1, ps2);
int parser_flags = compute_parser_flags(flags);
struct tok_state *tok = _PyTokenizer_FromFile(fp, enc, ps1, ps2,
parser_flags & PyPARSE_BARRY_AS_BDFL);
if (tok == NULL) {
if (PyErr_Occurred()) {
_PyTokenizer_raise_init_error(filename_ob);
Expand All @@ -1080,7 +1082,6 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena
goto error;
}

int parser_flags = compute_parser_flags(flags);
Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, PY_MINOR_VERSION,
errcode, NULL, arena);
if (p == NULL) {
Expand Down
6 changes: 4 additions & 2 deletions Parser/tokenizer/file_tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@ tok_underflow_file(struct tok_state *tok)
/* Set up tokenizer for file */
struct tok_state *
_PyTokenizer_FromFile(FILE *fp, const char* enc,
const char *ps1, const char *ps2)
const char *ps1, const char *ps2,
int BARRY_AS_BDFL)
{
struct tok_state *tok = _PyTokenizer_tok_new();
if (tok == NULL)
Expand Down Expand Up @@ -401,6 +402,7 @@ _PyTokenizer_FromFile(FILE *fp, const char* enc,
}
tok->decoding_state = STATE_NORMAL;
}
tok->BARRY_AS_BDFL = BARRY_AS_BDFL;
return tok;
}

Expand Down Expand Up @@ -457,7 +459,7 @@ _PyTokenizer_FindEncodingFilename(int fd, PyObject *filename)
if (fp == NULL) {
return NULL;
}
tok = _PyTokenizer_FromFile(fp, NULL, NULL, NULL);
tok = _PyTokenizer_FromFile(fp, NULL, NULL, NULL, 0);
if (tok == NULL) {
fclose(fp);
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion Parser/tokenizer/tokenizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ struct tok_state *_PyTokenizer_FromString(const char *, int, int, int);
struct tok_state *_PyTokenizer_FromUTF8(const char *, int, int, int);
struct tok_state *_PyTokenizer_FromReadline(PyObject*, const char*, int, int);
struct tok_state *_PyTokenizer_FromFile(FILE *, const char*,
const char *, const char *);
const char *, const char *, int);

#define tok_dump _Py_tok_dump

Expand Down
Loading