Skip to content

[3.9] bpo-45866: pegen strips directory of "generated from" header (GH-29777) (GH-29792) #29797

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
merged 1 commit into from
Nov 26, 2021
Merged

[3.9] bpo-45866: pegen strips directory of "generated from" header (GH-29777) (GH-29792) #29797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Build/2021-11-25-13-53-36.bpo-45866.ZH1W8N.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
``make regen-all`` now produces the same output when run from a directory
other than the source tree: when building Python out of the source tree.
pegen now strips directory of the "generated by pygen from <FILENAME" header
Copy link
Member

@encukou encukou Nov 26, 2021

Choose a reason for hiding this comment

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

Suggested change
pegen now strips directory of the "generated by pygen from <FILENAME" header
pegen now strips directory of the "generated by pygen from <FILENAME>" header

Copy link
Member Author

@vstinner vstinner Nov 26, 2021

Choose a reason for hiding this comment

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

Oh, that's a backport of a change which already landed in main and 3.10 branches :-( I prefer to keep the typo. The typo can be fixed in a separated PR, but I'm not really motivated to write a PR just for that :-p

Copy link
Member Author

@vstinner vstinner Nov 26, 2021

Choose a reason for hiding this comment

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

Well, I created PR to fix this important typo :-) https://github.com/python/cpython/pull/29798/files

cc @hroncok

Copy link
Contributor

@hroncok hroncok Nov 26, 2021

Choose a reason for hiding this comment

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

Unclosed <

Patch by Victor Stinner.
2 changes: 1 addition & 1 deletion Parser/pegen/parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// @generated by pegen.py from ./Grammar/python.gram
// @generated by pegen.py from python.gram
#include "pegen.h"

#if defined(Py_DEBUG) && defined(Py_BUILD_CORE)
Expand Down
4 changes: 3 additions & 1 deletion Tools/peg_generator/pegen/c_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import ast
from dataclasses import field, dataclass
import os.path
import re
from typing import Any, Dict, IO, Optional, List, Text, Tuple, Set
from enum import Enum
Expand Down Expand Up @@ -379,7 +380,8 @@ def out_of_memory_goto(self, expr: str, goto_target: str) -> None:

def generate(self, filename: str) -> None:
self.collect_todo()
self.print(f"// @generated by pegen.py from {filename}")
basename = os.path.basename(filename)
self.print(f"// @generated by pegen.py from {basename}")
header = self.grammar.metas.get("header", EXTENSION_PREFIX)
if header:
self.print(header.rstrip("\n"))
Expand Down
2 changes: 1 addition & 1 deletion Tools/peg_generator/pegen/grammar_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3.8
# @generated by pegen from ./Tools/peg_generator/pegen/metagrammar.gram
# @generated by pegen from metagrammar.gram

import ast
import sys
Expand Down
4 changes: 3 additions & 1 deletion Tools/peg_generator/pegen/python_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os.path
import token
from typing import Any, Dict, Optional, IO, Text, Tuple

Expand Down Expand Up @@ -142,7 +143,8 @@ def __init__(
def generate(self, filename: str) -> None:
header = self.grammar.metas.get("header", MODULE_PREFIX)
if header is not None:
self.print(header.rstrip("\n").format(filename=filename))
basename = os.path.basename(filename)
self.print(header.rstrip("\n").format(filename=basename))
subheader = self.grammar.metas.get("subheader", "")
if subheader:
self.print(subheader.format(filename=filename))
Expand Down