Non-column attributes on child class overwrite column attributes of p…

…arent class (fix #399) (#400)

.gitignore

@@ -17,3 +17,5 @@
 /example/.env
 /report.pylint
 .cache/
+.python-version
+.idea

django_tables2/tables.py

@@ -210,11 +210,17 @@ def __new__(mcs, name, bases, attrs):
 
         # Explicit columns override both parent and generated columns
         base_columns.update(OrderedDict(cols))
+
         # Apply any explicit exclude setting
         for exclusion in opts.exclude:
             if exclusion in base_columns:
                 base_columns.pop(exclusion)
 
+        # Remove any columns from our remainder, else columns from our parent class will remain
+        for attr_name in remainder:
+            if attr_name in base_columns:
+                base_columns.pop(attr_name)
+
         # Reorder the columns based on explicit sequence
         if opts.sequence:
             opts.sequence.expand(base_columns.keys())

example/requirements.pip

@@ -1,2 +1,2 @@
 -e ..
-django-debug-toolbar
+django-debug-toolbar<1.6

tests/test_core.py

@@ -77,6 +77,13 @@ class CityTable(GeoAreaTable, AddedMixin):
     assert len(CityTable.base_columns) == 4
     assert 'added' in CityTable.base_columns
 
+    # overwrite a column with a non-column
+    class MayorlessCityTable(CityTable):
+        mayor = None
+
+    assert len(MayorlessCityTable.base_columns) == 3
+
+
 
 def test_metaclass_inheritance():
     class Tweaker(type):