Skip to content

gh-104050: Add more annotations to Tools/clinic.py #104544

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
AlexWaygood merged 6 commits into from
May 16, 2023
Merged

gh-104050: Add more annotations to Tools/clinic.py #104544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8020dbd
gh-104050: Add more annotations to `Tools/clinic.py`
sobolevn May 16, 2023
9a44981
Merge branch 'main' into issue-104050
AlexWaygood May 16, 2023
b23fd0b
Minor issues
sobolevn May 16, 2023
d933b35
Merge branch 'main' into issue-104050
AlexWaygood May 16, 2023
7eb4f4e
Address review
sobolevn May 16, 2023
7739409
Merge branch 'issue-104050' of https://github.com/sobolevn/cpython in…
sobolevn May 16, 2023
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
Minor issues
  • Loading branch information
@sobolevn
sobolevn committed May 16, 2023
commit b23fd0b843ef567bb033d3cfb451b5dcf06de951
18 changes: 13 additions & 5 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,22 @@ def text_accumulator() -> TextAccumulator:

@overload
def warn_or_fail(
*args,
*args: object,
fail: Literal[True],
filename: str | None = None,
line_number: int | None = None,
) -> NoReturn: ...
Comment thread
sobolevn marked this conversation as resolved.

@overload
def warn_or_fail(
*args,
*args: object,
fail: Literal[False] = False,
filename: str | None = None,
line_number: int | None = None,
) -> None: ...

def warn_or_fail(
*args,
*args: object,
fail: bool = False,
filename: str | None = None,
line_number: int | None = None,
Expand All @@ -160,10 +160,18 @@ def warn_or_fail(
sys.exit(-1)


def warn(*args, filename: str | None = None, line_number: int | None = None) -> None:
def warn(
*args: object,
filename: str | None = None,
line_number: int | None = None,
) -> None:
return warn_or_fail(*args, filename=filename, line_number=line_number, fail=False)

def fail(*args, filename: str | None = None, line_number: int | None = None) -> NoReturn:
def fail(
*args: object,
filename: str | None = None,
line_number: int | None = None,
) -> NoReturn:
warn_or_fail(*args, filename=filename, line_number=line_number, fail=True)


Expand Down
2 changes: 1 addition & 1 deletion Tools/clinic/cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def fail(self, *a: object) -> NoReturn:
print(" ", ' '.join(str(x) for x in a))
sys.exit(-1)

def close(self):
def close(self) -> None:
if self.stack:
self.fail("Ended file while still in a preprocessor conditional block!")

Expand Down