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

Add ManyToManyField.m2m_field_name and Model._get_pk_val methods #2177

Merged
merged 6 commits into from
May 28, 2024
Merged

Add ManyToManyField.m2m_field_name and Model._get_pk_val methods #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df2ad0b
Add Model._get_pk_val stub.
YPCrumble May 22, 2024
3e80fb6
Add stub for ManyToManyField._m2m_field_name.
YPCrumble May 22, 2024
4835334
Update type hint for _get_pk_val to fix _meta type.
YPCrumble May 22, 2024
c17d117
Update django-stubs/db/models/base.pyi
intgr May 28, 2024
2695a40
Merge branch 'master' into feature/add-get-pk-val
intgr May 28, 2024
9c404d7
Update & cleanup allowlists
intgr May 28, 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
1 change: 1 addition & 0 deletions django-stubs/db/models/base.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,6 @@ class Model(metaclass=ModelBase):
@classmethod
def check(cls, **kwargs: Any) -> list[CheckMessage]: ...
def __getstate__(self) -> dict: ...
def _get_pk_val(self, meta: Options[Self] | None = None) -> str: ...

def model_unpickle(model_id: tuple[str, str] | type[Model]) -> Model: ...
1 change: 1 addition & 0 deletions django-stubs/db/models/fields/related.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ class ManyToManyField(RelatedField[Any, Any], Generic[_To, _Through]):
def m2m_db_table(self) -> str: ...
def m2m_column_name(self) -> str: ...
def m2m_reverse_name(self) -> str: ...
def m2m_field_name(self) -> str: ...
def m2m_reverse_field_name(self) -> str: ...
def m2m_target_field_name(self) -> str: ...
def m2m_reverse_target_field_name(self) -> str: ...
Expand Down
25 changes: 25 additions & 0 deletions scripts/stubtest/allowlist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,28 @@ django.contrib.sessions.base_session.AbstractBaseSession.Meta
# Custom __str__ that we don't want to overcomplicate:
django.forms.utils.RenderableMixin.__str__
django.forms.utils.RenderableMixin.__html__

# Dynamically added in ManyToManyField.contribute_to_class()
django.db.models.ManyToManyField.m2m_db_table
django.db.models.fields.related.ManyToManyField.m2m_db_table
django.contrib.gis.db.models.ManyToManyField.m2m_db_table

# Dynamically added in ManyToManyField.contribute_to_related_class()
django.db.models.ManyToManyField.m2m_column_name
django.db.models.ManyToManyField.m2m_field_name
django.db.models.ManyToManyField.m2m_reverse_field_name
django.db.models.ManyToManyField.m2m_reverse_name
django.db.models.ManyToManyField.m2m_reverse_target_field_name
django.db.models.ManyToManyField.m2m_target_field_name
django.db.models.fields.related.ManyToManyField.m2m_column_name
django.db.models.fields.related.ManyToManyField.m2m_field_name
django.db.models.fields.related.ManyToManyField.m2m_reverse_field_name
django.db.models.fields.related.ManyToManyField.m2m_reverse_name
django.db.models.fields.related.ManyToManyField.m2m_reverse_target_field_name
django.db.models.fields.related.ManyToManyField.m2m_target_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_column_name
django.contrib.gis.db.models.ManyToManyField.m2m_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_name
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_target_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_target_field_name
18 changes: 0 additions & 18 deletions scripts/stubtest/allowlist_todo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,6 @@ django.contrib.gis.db.models.Manager.__slotnames__
django.contrib.gis.db.models.ManyToManyField.__get__
django.contrib.gis.db.models.ManyToManyField.contribute_to_class
django.contrib.gis.db.models.ManyToManyField.formfield
django.contrib.gis.db.models.ManyToManyField.m2m_column_name
django.contrib.gis.db.models.ManyToManyField.m2m_db_table
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_name
django.contrib.gis.db.models.ManyToManyField.m2m_reverse_target_field_name
django.contrib.gis.db.models.ManyToManyField.m2m_target_field_name
django.contrib.gis.db.models.ManyToManyField.path_infos
django.contrib.gis.db.models.ManyToManyField.reverse_path_infos
django.contrib.gis.db.models.ManyToManyRel.identity
Expand Down Expand Up @@ -777,12 +771,6 @@ django.db.models.Manager.__slotnames__
django.db.models.ManyToManyField.__get__
django.db.models.ManyToManyField.contribute_to_class
django.db.models.ManyToManyField.formfield
django.db.models.ManyToManyField.m2m_column_name
django.db.models.ManyToManyField.m2m_db_table
django.db.models.ManyToManyField.m2m_reverse_field_name
django.db.models.ManyToManyField.m2m_reverse_name
django.db.models.ManyToManyField.m2m_reverse_target_field_name
django.db.models.ManyToManyField.m2m_target_field_name
django.db.models.ManyToManyField.path_infos
django.db.models.ManyToManyField.reverse_path_infos
django.db.models.ManyToManyRel.identity
Expand Down Expand Up @@ -1005,12 +993,6 @@ django.db.models.fields.related.ForeignObjectRel.path_infos
django.db.models.fields.related.ManyToManyField.__get__
django.db.models.fields.related.ManyToManyField.contribute_to_class
django.db.models.fields.related.ManyToManyField.formfield
django.db.models.fields.related.ManyToManyField.m2m_column_name
django.db.models.fields.related.ManyToManyField.m2m_db_table
django.db.models.fields.related.ManyToManyField.m2m_reverse_field_name
django.db.models.fields.related.ManyToManyField.m2m_reverse_name
django.db.models.fields.related.ManyToManyField.m2m_reverse_target_field_name
django.db.models.fields.related.ManyToManyField.m2m_target_field_name
django.db.models.fields.related.ManyToManyField.path_infos
django.db.models.fields.related.ManyToManyField.reverse_path_infos
django.db.models.fields.related.ManyToManyRel.identity
Expand Down
Loading