Update some field attributes for Django 5.1 (#2583)

From django/django@02a600f:

* `django.contrib.contenttypes.models.ContentType.get_object_for_this_type` changed - new `using` parameter

From django/django@5e80390:

* `django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name` added

From django/django@b8983dc:

* `django.forms.models.ModelChoiceField.validate_no_null_characters` added

Co-authored-by: sobolevn <mail@sobolevn.me>

Author: adamchainz

django-stubs/contrib/contenttypes/models.pyi

@@ -19,6 +19,6 @@ class ContentType(models.Model):
     @property
     def name(self) -> str: ...
     def model_class(self) -> type[Model] | None: ...
-    def get_object_for_this_type(self, **kwargs: Any) -> Model: ...
+    def get_object_for_this_type(self, using: str | None = None, **kwargs: Any) -> Model: ...
     def get_all_objects_for_this_type(self, **kwargs: Any) -> QuerySet: ...
     def natural_key(self) -> tuple[str, str]: ...

django-stubs/db/models/fields/reverse_related.pyi

@@ -86,6 +86,8 @@ class ForeignObjectRel(FieldCacheMixin):
         self, where_class: type[WhereNode], alias: str, related_alias: str
     ) -> StartsWith | WhereNode | None: ...
     def set_field_name(self) -> None: ...
+    @cached_property
+    def accessor_name(self) -> str | None: ...
     def get_accessor_name(self, model: type[Model] | None = None) -> str | None: ...
     def get_path_info(self, filtered_relation: FilteredRelation | None = None) -> list[PathInfo]: ...
 

django-stubs/forms/models.pyi

@@ -279,6 +279,7 @@ class ModelChoiceField(ChoiceField, Generic[_M]):
         blank: bool = False,
         **kwargs: Any,
     ) -> None: ...
+    def validate_no_null_characters(self, value: Any) -> None: ...
     def get_limit_choices_to(self) -> _LimitChoicesTo: ...
     def label_from_instance(self, obj: _M) -> str: ...
     choices: _PropertyDescriptor[

scripts/stubtest/allowlist.txt

@@ -180,6 +180,7 @@ django.contrib.gis.db.models.ForeignObject.foreign_related_fields
 django.contrib.gis.db.models.ForeignObject.local_related_fields
 django.contrib.gis.db.models.ForeignObject.related_fields
 django.contrib.gis.db.models.ForeignObject.reverse_related_fields
+django.contrib.gis.db.models.ForeignObjectRel.accessor_name
 django.contrib.gis.db.models.ForeignObjectRel.cache_name
 django.contrib.gis.db.models.ForeignObjectRel.hidden
 django.contrib.gis.db.models.ForeignObjectRel.many_to_many
@@ -306,6 +307,7 @@ django.db.models.ForeignObject.foreign_related_fields
 django.db.models.ForeignObject.local_related_fields
 django.db.models.ForeignObject.related_fields
 django.db.models.ForeignObject.reverse_related_fields
+django.db.models.ForeignObjectRel.accessor_name
 django.db.models.ForeignObjectRel.cache_name
 django.db.models.ForeignObjectRel.hidden
 django.db.models.ForeignObjectRel.many_to_many
@@ -334,6 +336,7 @@ django.db.models.fields.related.ForeignObject.foreign_related_fields
 django.db.models.fields.related.ForeignObject.local_related_fields
 django.db.models.fields.related.ForeignObject.related_fields
 django.db.models.fields.related.ForeignObject.reverse_related_fields
+django.db.models.fields.related.ForeignObjectRel.accessor_name
 django.db.models.fields.related.ForeignObjectRel.cache_name
 django.db.models.fields.related.ForeignObjectRel.hidden
 django.db.models.fields.related.ForeignObjectRel.many_to_many
@@ -352,6 +355,7 @@ django.db.models.fields.related_descriptors.ForwardManyToOneDescriptor.RelatedOb
 django.db.models.fields.related_descriptors.ManyToManyDescriptor.related_manager_cls
 django.db.models.fields.related_descriptors.ReverseManyToOneDescriptor.related_manager_cls
 django.db.models.fields.related_descriptors.ReverseOneToOneDescriptor.RelatedObjectDoesNotExist
+django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name
 django.db.models.fields.reverse_related.ForeignObjectRel.cache_name
 django.db.models.fields.reverse_related.ForeignObjectRel.hidden
 django.db.models.fields.reverse_related.ForeignObjectRel.many_to_many

scripts/stubtest/allowlist_todo_django52.txt

@@ -3,7 +3,6 @@
 # Created for 5.2 update:
 django.contrib.contenttypes.fields.GenericRelation.get_foreign_related_value
 django.contrib.contenttypes.fields.GenericRelation.get_local_related_value
-django.contrib.contenttypes.models.ContentType.get_object_for_this_type
 django.contrib.gis.db.backends.mysql.schema.MySQLGISSchemaEditor.__init__
 django.contrib.gis.db.backends.mysql.schema.MySQLGISSchemaEditor.create_spatial_indexes
 django.contrib.gis.db.backends.oracle.operations.OracleOperations.convert_extent
@@ -13,12 +12,10 @@ django.contrib.gis.db.models.Count.allows_composite_expressions
 django.contrib.gis.db.models.Field._get_flatchoices
 django.contrib.gis.db.models.Field.has_db_default
 django.contrib.gis.db.models.ForeignKey.cast_db_type
-django.contrib.gis.db.models.ForeignObjectRel.accessor_name
 django.contrib.gis.db.models.OrderBy.allows_composite_expressions
 django.contrib.gis.db.models.Q.identity
 django.contrib.gis.forms.BaseForm.bound_field_class
 django.contrib.gis.forms.BoundField.aria_describedby
-django.contrib.gis.forms.ModelChoiceField.validate_no_null_characters
 django.contrib.gis.gdal.OGRGeometry.geos_support
 django.contrib.gis.gdal.OGRGeometry.get_curve_geometry
 django.contrib.gis.gdal.OGRGeometry.get_linear_geometry
@@ -106,7 +103,6 @@ django.db.models.Count.allows_composite_expressions
 django.db.models.Field._get_flatchoices
 django.db.models.Field.has_db_default
 django.db.models.ForeignKey.cast_db_type
-django.db.models.ForeignObjectRel.accessor_name
 django.db.models.OrderBy.allows_composite_expressions
 django.db.models.Q.identity
 django.db.models.aggregates.Count.allows_composite_expressions
@@ -120,9 +116,7 @@ django.db.models.fields.Field._get_flatchoices
 django.db.models.fields.Field.has_db_default
 django.db.models.fields.composite.unnest
 django.db.models.fields.related.ForeignKey.cast_db_type
-django.db.models.fields.related.ForeignObjectRel.accessor_name
 django.db.models.fields.related_lookups.MultiColSource
-django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name
 django.db.models.fields.tuple_lookups
 django.db.models.functions.JSONObject.join
 django.db.models.functions.json.JSONObject.join
@@ -134,10 +128,8 @@ django.db.models.sql.compiler.SQLCompiler.has_composite_fields
 django.db.models.sql.compiler.SQLInsertCompiler.field_as_sql
 django.forms.BaseForm.bound_field_class
 django.forms.BoundField.aria_describedby
-django.forms.ModelChoiceField.validate_no_null_characters
 django.forms.boundfield.BoundField.aria_describedby
 django.forms.forms.BaseForm.bound_field_class
-django.forms.models.ModelChoiceField.validate_no_null_characters
 django.forms.renderers.BaseRenderer.bound_field_class
 django.http.QueryDict.pop
 django.http.request.QueryDict.pop