diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-12-29 08:56:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 08:56:39 +0100 |
| commit | ce30e750e6259068ac348aa71f855a5f70d2d49f (patch) | |
| tree | ed025908608c0e6e51d29646144bdacb0b99bdca /django/db | |
| parent | c76d51b3ad34bc2ed2155054bfb283ef53beb26a (diff) | |
Used model's Options.label where applicable.
Follow up to b7a3a6c9ef0a89625881b47594120bca55fa2e49.
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/fields/__init__.py | 3 | ||||
| -rw-r--r-- | django/db/models/fields/related.py | 16 | ||||
| -rw-r--r-- | django/db/models/manager.py | 5 |
3 files changed, 6 insertions, 18 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index c84136680d..5b8b3cab23 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -183,8 +183,7 @@ class Field(RegisterLookupMixin): if not hasattr(self, 'model'): return super().__str__() model = self.model - app = model._meta.app_label - return '%s.%s.%s' % (app, model._meta.object_name, self.name) + return '%s.%s' % (model._meta.label, self.name) def __repr__(self): """Display the module, class, and name of the field.""" diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 397146a354..5777ebc3b1 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -172,14 +172,10 @@ class RelatedField(FieldCacheMixin, Field): if (self.remote_field.model not in self.opts.apps.get_models() and not isinstance(self.remote_field.model, str) and self.remote_field.model._meta.swapped): - model = "%s.%s" % ( - self.remote_field.model._meta.app_label, - self.remote_field.model._meta.object_name - ) return [ checks.Error( "Field defines a relation with the model '%s', which has " - "been swapped out." % model, + "been swapped out." % self.remote_field.model._meta.label, hint="Update the relation to point at 'settings.%s'." % self.remote_field.model._meta.swappable, obj=self, id='fields.E301', @@ -1479,18 +1475,12 @@ class ManyToManyField(RelatedField): if isinstance(self.remote_field.model, str): kwargs['to'] = self.remote_field.model else: - kwargs['to'] = "%s.%s" % ( - self.remote_field.model._meta.app_label, - self.remote_field.model._meta.object_name, - ) + kwargs['to'] = self.remote_field.model._meta.label if getattr(self.remote_field, 'through', None) is not None: if isinstance(self.remote_field.through, str): kwargs['through'] = self.remote_field.through elif not self.remote_field.through._meta.auto_created: - kwargs['through'] = "%s.%s" % ( - self.remote_field.through._meta.app_label, - self.remote_field.through._meta.object_name, - ) + kwargs['through'] = self.remote_field.through._meta.label # If swappable is True, then see if we're actually pointing to the target # of a swap. swappable_setting = self.swappable_setting diff --git a/django/db/models/manager.py b/django/db/models/manager.py index e4d8fd0efc..655dfcf8e7 100644 --- a/django/db/models/manager.py +++ b/django/db/models/manager.py @@ -185,9 +185,8 @@ class ManagerDescriptor: if cls._meta.swapped: raise AttributeError( - "Manager isn't available; '%s.%s' has been swapped for '%s'" % ( - cls._meta.app_label, - cls._meta.object_name, + "Manager isn't available; '%s' has been swapped for '%s'" % ( + cls._meta.label, cls._meta.swapped, ) ) |