diff options
| -rw-r--r-- | django/db/models/fields/__init__.py | 10 | ||||
| -rw-r--r-- | tests/regressiontests/model_fields/tests.py | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index b9604f5006..9037265e8b 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -444,6 +444,16 @@ class Field(object): "Returns the value of this field in the given model instance." return getattr(obj, self.attname) + def __repr__(self): + """ + Displays the module, class and name of the field. + """ + path = '%s.%s' % (self.__class__.__module__, self.__class__.__name__) + name = getattr(self, 'name', None) + if name is not None: + return '<%s: %s>' % (path, name) + return '<%s>' % path + class AutoField(Field): description = _("Integer") diff --git a/tests/regressiontests/model_fields/tests.py b/tests/regressiontests/model_fields/tests.py index 3ec9d7a8b7..b42c0af784 100644 --- a/tests/regressiontests/model_fields/tests.py +++ b/tests/regressiontests/model_fields/tests.py @@ -48,6 +48,15 @@ class BasicFieldTests(test.TestCase): except ValidationError, e: self.fail("NullBooleanField failed validation with value of None: %s" % e.messages) + def test_field_repr(self): + """ + Regression test for #5931: __repr__ of a field also displays its name + """ + f = Foo._meta.get_field('a') + self.assertEqual(repr(f), '<django.db.models.fields.CharField: a>') + f = models.fields.CharField() + self.assertEqual(repr(f), '<django.db.models.fields.CharField>') + class DecimalFieldTests(test.TestCase): def test_to_python(self): f = models.DecimalField(max_digits=4, decimal_places=2) |