-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Fix types in _interpqueues and _interpreters
#13355
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e6f764c
Fix types in `_interpqueues` and `_interpreters`
max-muoto 5c4d557
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5849d97
_UnboundOp should be private
max-muoto 9452e9e
Use TypeAlias
max-muoto c78b6aa
Add callable for `code` in `exec`
max-muoto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,19 @@ | ||
| from typing import Any, SupportsIndex | ||
| from typing import Any, Literal, SupportsIndex | ||
| from typing_extensions import TypeAlias | ||
|
|
||
| _UnboundOp: TypeAlias = Literal[1, 2, 3] | ||
|
|
||
| class QueueError(RuntimeError): ... | ||
| class QueueNotFoundError(QueueError): ... | ||
|
|
||
| def bind(qid: SupportsIndex) -> None: ... | ||
| def create(maxsize: SupportsIndex, fmt: SupportsIndex) -> int: ... | ||
| def create(maxsize: SupportsIndex, fmt: SupportsIndex, unboundop: _UnboundOp) -> int: ... | ||
| def destroy(qid: SupportsIndex) -> None: ... | ||
| def get(qid: SupportsIndex) -> tuple[Any, int]: ... | ||
| def get(qid: SupportsIndex) -> tuple[Any, int, _UnboundOp | None]: ... | ||
| def get_count(qid: SupportsIndex) -> int: ... | ||
| def get_maxsize(qid: SupportsIndex) -> int: ... | ||
| def get_queue_defaults(qid: SupportsIndex) -> tuple[int]: ... | ||
| def get_queue_defaults(qid: SupportsIndex) -> tuple[int, _UnboundOp]: ... | ||
| def is_full(qid: SupportsIndex) -> bool: ... | ||
| def list_all() -> list[tuple[int, int]]: ... | ||
| def put(qid: SupportsIndex, obj: Any, fmt: SupportsIndex) -> None: ... | ||
| def list_all() -> list[tuple[int, int, _UnboundOp]]: ... | ||
| def put(qid: SupportsIndex, obj: Any, fmt: SupportsIndex, unboundop: _UnboundOp) -> None: ... | ||
| def release(qid: SupportsIndex) -> None: ... | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a specific reason for this, rather than using
SupportsIndex? The way I see it, I can't pass my own constants likeUNBOUND = 2; I'd have to pass a literal 2 to each call.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's the general pattern across typeshed when literals are required to avoid a runtime error, additionally, what you're describing would work if you're using Pyright: https://pyright-play.net/?pyrightVersion=1.1.384&pythonVersion=3.14&strict=true&code=GYJw9gtgBALgngBwJYDsDmUkQWEMoAySMApiAIYA2AUNQLICaA%2BgQJIAqUAvFAEy0ATEsCjAwYABQAPAFyFiZKgG1eAXQCUUALQA%2BKADkwKEnIB052tTGTGLDuupA
If you're using MyPy, my recommendation would be to annotate
UNBOUNDwithFinal, which will treat it as an immutable constant and automatically infer the literal: https://mypy-play.net/?mypy=latest&python=3.12&gist=6f3c5ecd5b1a4dba41ac352a57694898