Skip to content
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

Adding missing Q methods: check(), flatten() #1899

Merged
merged 6 commits into from
Mar 20, 2024
+3 −6
Merged

Adding missing Q methods: check(), flatten() #1899

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ba2d47
Adding missing Q methods
Alexerson Jan 3, 2024
8b76bca
Fix missing dict param
Alexerson Jan 3, 2024
b4d63ba
Update django-stubs/db/models/query_utils.pyi
Alexerson Feb 14, 2024
cede124
Fix allowlist_todo
Alexerson Feb 14, 2024
10b7da7
Use `Incomplete` for `flatten` type hints.
Alexerson Mar 20, 2024
e8f5cad
Merge branch 'master' into feature/q-methods
Alexerson Mar 20, 2024
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
Loading
Loading status checks…
Update django-stubs/db/models/query_utils.pyi 
Co-authored-by: Victorien <65306057+Viicos@users.noreply.github.com>
@Alexerson @Viicos
Alexerson and Viicos authored Feb 14, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit b4d63bae6f8eed84b8105c5c08f7b157202bf722
2 changes: 1 addition & 1 deletion django-stubs/db/models/query_utils.pyi
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ class Q(tree.Node):
for_save: bool = ...,
) -> WhereNode: ...
def flatten(self) -> Iterator[Any]: ...
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
def flatten(self) -> Iterator[Any]: ...
def flatten(self) -> Iterator[Node | NothingNode | ???]: ...

Not sure if anything else could be yielded

Copy link
Collaborator

@intgr intgr Mar 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Our typing of Node.children and Q.__init__(args, kwargs) is incomplete also; _NodeChildren looks wrong when I look at flatten() code.

If you're not interested in un-entangling those, I think best to use Incomplete with from _typeshed import Incomplete

def check(self, against: dict[str, Any], using: str) -> bool: ...
def check(self, against: dict[str, Any], using: str = ...) -> bool: ...
def deconstruct(self) -> tuple[str, Sequence[Any], dict[str, Any]]: ...

class DeferredAttribute: