as promised, reverted (with minor exceptions) the previous changeset

diff --git a/README b/README
index 6d241e2dcbb44eebd16d9987fc47a39837e11efc..38153ea7e1b36b2f818c75a29b07bd8967256afd 100644 (file)
--- a/README
+++ b/README
@@ -190,11 +190,6 @@ verbose_name, default, visible, sortable
     Setting ``sortable`` to False will result in this column being unusable\r
     in ordering.\r
 \r
-    The ``choices`` argument currently expects a boolean value (defaults to\r
-    False). If enabled, the column will be able to hold an id/value pair.\r
-    more extensive choices support (mapping an id to predefined value) is\r
-    forthcoming.\r
-\r
 ``django_tables.columns`` currently defines three classes, ``Column``,\r
 ``TextColumn`` and ``NumberColumn``. However, the two subclasses currently\r
 don't do anything special at all, so you can simply use the base class.\r

diff --git a/django_tables/columns.py b/django_tables/columns.py
index 2da8cac9b7db21838043a66378ef1ba3d0fe5455..6ea137b2584c2762c4e12f19fe15cdc879206b34 100644 (file)
--- a/django_tables/columns.py
+++ b/django_tables/columns.py
@@ -25,16 +25,12 @@ class Column(object):
 \r
     Setting ``sortable`` to False will result in this column being unusable\r
     in ordering.\r
-\r
-    The ``choices`` argument currently expects a boolean value (defaults to\r
-    False). If enabled, the column will be able to hold an id/value pair.\r
     """\r
     # Tracks each time a Column instance is created. Used to retain order.\r
     creation_counter = 0\r
 \r
     def __init__(self, verbose_name=None, name=None, default=None,\r
-                 visible=True, inaccessible=False, sortable=True,\r
-                 choices=None):\r
+                 visible=True, inaccessible=False, sortable=True):\r
         self.verbose_name = verbose_name\r
         self.name = name\r
         self.default = default\r

diff --git a/django_tables/tables.py b/django_tables/tables.py
index 44f604331c0ecbdc805f546f5ad582f0078ca448..aa0980370c264a6e3bf8bb72021dd54ac3edb149 100644 (file)
--- a/django_tables/tables.py
+++ b/django_tables/tables.py
@@ -357,8 +357,7 @@ class BoundRow(object):
     def __getitem__(self, name):\r
         """Returns this row's value for a column. All other access methods,\r
         e.g. __iter__, lead ultimately to this."""\r
-        column = self.table.columns[name]\r
-        return RowValue(self.data[column.declared_name], column)\r
+        return self.data[self.table.columns[name].declared_name]\r
 \r
     def __contains__(self, item):\r
         """Check by both row object and column name."""\r
@@ -373,30 +372,4 @@ class BoundRow(object):
     values = property(_get_values)\r
 \r
     def as_html(self):\r
-        pass\r
-\r
-class RowValue(StrAndUnicode):\r
-    """Very basic wrapper around a single row value of a column.\r
-\r
-    Instead of returning the row values directly, ``BoundRow`` spawns\r
-    instances of this class. That's necessary since the ``choices``\r
-    feature means that a single row value can consist of both the value\r
-    itself and an associated ID.\r
-    """\r
-    def __init__(self, value, column):\r
-        if column.column.choices == True:\r
-            if isinstance(value, dict):\r
-                self.id = value.get('id')\r
-                self.value = value.get('value')\r
-            elif isinstance(value, (tuple,list,)):\r
-                self.id = value[0]\r
-                self.value = value[1]\r
-            else:\r
-                self.id = None\r
-                self.value = value\r
-        else:\r
-            self.id = None\r
-            self.value = value\r
-\r
-    def __unicode__(self):\r
-        return unicode(self.value)
\ No newline at end of file
+        pass
\ No newline at end of file

diff --git a/tests/test_basic.py b/tests/test_basic.py
index a1ffd9fd89d0cad03f81f37f909e647deb72f8ae..a3b8295732f94bd1e14dc9e7606392337132c9fa 100644 (file)
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -121,23 +121,4 @@ def test_sort():
     books.base_columns['language'].sortable = False\r
     books.order_by = 'language'\r
     assert not books.order_by\r
-    test_order(('language', 'num_pages'), [1,3,2,4])  # as if: 'num_pages'\r
-\r
-def test_choices():\r
-    # unrestricted choices\r
-    class BookTable(tables.Table):\r
-        id = tables.Column()\r
-        name = tables.Column()\r
-        author = tables.Column(choices=True)\r
-\r
-    books = BookTable([\r
-        {'id': 1, 'name': 'A'},\r
-        {'id': 2, 'author': (99, 'Mr. Vanderlay'), 'name': 'B'},\r
-        {'id': 3, 'author': 'Mr. Vanderlay', 'name': 'C'},\r
-        {'id': 4, 'author': {'id': 99, 'value': 'Mr. Vanderlay'}, 'name': 'D'},\r
-    ])\r
-\r
-    assert [r['author'].id for r in books.rows] == [None, 99, None, 99]\r
-    assert [r['author'].value for r in books.rows] == [None, 'Mr. Vanderlay', 'Mr. Vanderlay', 'Mr. Vanderlay']\r
-\r
-    # TODO: restricted choices (planned)
\ No newline at end of file
+    test_order(('language', 'num_pages'), [1,3,2,4])  # as if: 'num_pages'
\ No newline at end of file

diff --git a/tests/test_models.py b/tests/test_models.py
index ffe8eb7a5ba3ed5a5f16ab6cd946121a1bdeba54..1f01d83347ae2aa35e61e65732696202736c8ff0 100644 (file)
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -152,9 +152,6 @@ def test_sort():
     countries.order_by = ('custom1', 'custom2')\r
     assert countries.order_by == ()\r
 \r
-def test_choices():\r
-    pass # TODO\r
-\r
 def test_pagination():\r
     pass\r
 \r