Ticket #1905: comma.diff

../django/django/core/management.py

@@ -887 +887 @@
                         try:
                             f = opts.get_field(fn)
                         except models.FieldDoesNotExist:
-                            if not hasattr(cls, fn):
-                                e.add(opts, '"admin.list_display" refers to %r, which isn\'t an attribute, method or property.' % fn)
+                            try:
+                                if not hasattr(cls, fn):
+                                    e.add(opts, '"admin.list_display" refers to %r, which isn\'t an attribute, method or property.' % fn)
+                            except TypeError:
+                                e.add(opts, 'admin.list_display expects a tuple of strings. Did you perhaps forget to remove the comma at the end of this line when upgrading to post-magic-removal merge?')
                         else:
                             if isinstance(f, models.ManyToManyField):
                                 e.add(opts, '"admin.list_display" doesn\'t support ManyToManyFields (%r).' % fn)