Fixed a NameError. This potentially closes issue 5.

miracle2k · miracle2k · commit be350ede0fa2 · 2010-08-25T00:46:11.000+02:00
diff --git a/django_tables/models.py b/django_tables/models.py
@@ -70,7 +70,7 @@ def _default_render(self, boundcol):
             # also ``_validate_column_name``, where such a mechanism is
             # already implemented).
             if not hasattr(current, bit):
-                raise ValueError("Could not resolve %s from %s" % (bit, name))
+                raise ValueError("Could not resolve %s from %s" % (bit, boundcol.accessor))
 
             current = getattr(current, bit)
             if callable(current):
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -154,6 +154,18 @@ class CountryTable(tables.ModelTable):
     test_country_table(countries)
 
 
+def test_invalid_accessor():
+    """Test that a column being backed by a non-existent model property
+    is handled correctly.
+
+    Regression-Test: There used to be a NameError here.
+    """
+    class CountryTable(tables.ModelTable):
+        name = tables.Column(data='something-i-made-up')
+    countries = CountryTable(Country)
+    assert_raises(ValueError, countries[0].__getitem__, 'name')
+
+
 def test_caches():
     """Make sure the caches work for model tables as well (parts are
     reimplemented).
@@ -259,6 +271,7 @@ class Meta:
     assert [row['example_domain'] for row in countries] == \
                     [row['null'] for row in countries]
 
+
 def test_relationships():
     """Test relationship spanning."""
 
