diff options
| author | Adam Johnson <me@adamj.eu> | 2024-02-19 22:32:55 +0000 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2024-02-20 11:34:00 +0100 |
| commit | 31314980be428c0ab8a6cf40cce0a0c17ead8ec6 (patch) | |
| tree | 694e4a0cdc76beafe2d2369dd22c42dec16f6fd6 /django/contrib/contenttypes | |
| parent | e0496b2e9adb8f546e4b9895bc68955d2097ee88 (diff) | |
Fixed #35236 -- Used Field.attname/column attributes instead of get_attname()/get_attname_column().
Diffstat (limited to 'django/contrib/contenttypes')
| -rw-r--r-- | django/contrib/contenttypes/fields.py | 4 | ||||
| -rw-r--r-- | django/contrib/contenttypes/forms.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py index 3b21c742b6..770f88265c 100644 --- a/django/contrib/contenttypes/fields.py +++ b/django/contrib/contenttypes/fields.py @@ -187,7 +187,7 @@ class GenericForeignKey(FieldCacheMixin, Field): fk_dict = defaultdict(set) # We need one instance for each group in order to get the right db: instance_dict = {} - ct_attname = self.model._meta.get_field(self.ct_field).get_attname() + ct_attname = self.model._meta.get_field(self.ct_field).attname for instance in instances: # We avoid looking for values if either ct_id or fkey value is None ct_id = getattr(instance, ct_attname) @@ -240,7 +240,7 @@ class GenericForeignKey(FieldCacheMixin, Field): # content type ID here, and later when the actual instance is needed, # use ContentType.objects.get_for_id(), which has a global cache. f = self.model._meta.get_field(self.ct_field) - ct_id = getattr(instance, f.get_attname(), None) + ct_id = getattr(instance, f.attname, None) pk_val = getattr(instance, self.fk_field) rel_obj = self.get_cached_value(instance, default=None) diff --git a/django/contrib/contenttypes/forms.py b/django/contrib/contenttypes/forms.py index c0ff4f7257..741824e2fc 100644 --- a/django/contrib/contenttypes/forms.py +++ b/django/contrib/contenttypes/forms.py @@ -67,10 +67,10 @@ class BaseGenericInlineFormSet(BaseModelFormSet): def save_new(self, form, commit=True): setattr( form.instance, - self.ct_field.get_attname(), + self.ct_field.attname, ContentType.objects.get_for_model(self.instance).pk, ) - setattr(form.instance, self.ct_fk_field.get_attname(), self.instance.pk) + setattr(form.instance, self.ct_fk_field.attname, self.instance.pk) return form.save(commit=commit) |