Ticket #1054: magic_removal-admin_list_repr_to_str-2.diff

db/models/options.py

@@ -209 +209 @@
         save_on_top=False, list_select_related=False):
         self.fields = fields
         self.js = js or []
-        self.list_display = list_display or ['__repr__']
+        self.list_display = list_display or ['__str__']
         self.list_filter = list_filter or []
         self.date_hierarchy = date_hierarchy
         self.save_as, self.ordering = save_as, ordering

contrib/admin/templatetags/admin_list.py

@@ -76 +76 @@
         except models.FieldDoesNotExist:
             # For non-field list_display values, check for the function
             # attribute "short_description". If that doesn't exist, fall
-            # back to the method name. And __repr__ is a special-case.
-            if field_name == '__repr__':
+            # back to the method name. And __str__ is a special-case.
+            if field_name == '__str__':
                 header = lookup_opts.verbose_name
             else:
                 func = getattr(cl.model, field_name) # Let AttributeErrors propogate.