summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2011-06-30 16:28:56 -0400
committerKenneth Reitz <me@kennethreitz.com>2011-06-30 16:28:56 -0400
commitd254c2d2b02b026d08cef01475d16fcc51e763ec (patch)
treeccbd6b34f63adff51b816ac779659971a2ead14d
parent9b235150cf58721596a2ca650e26237b1fd59aba (diff)
downloadtablib-d254c2d2b02b026d08cef01475d16fcc51e763ec.tar.gz
dynamic columns bugfix for @mwalling :)
-rw-r--r--AUTHORS3
-rw-r--r--HISTORY.rst10
-rw-r--r--tablib/core.py10
3 files changed, 16 insertions, 7 deletions
diff --git a/AUTHORS b/AUTHORS
index facbd2e..abd4d8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,5 @@ Patches and Suggestions
- Luca Beltrame
- Benjamin Wohlwend
- Erik Youngren
-- Mark Rogers \ No newline at end of file
+- Mark Rogers
+- Mark Walling \ No newline at end of file
diff --git a/HISTORY.rst b/HISTORY.rst
index e3eb4fc..096d1c5 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,16 @@
History
-------
+0.9.11 (2011-06-30)
++++++++++++++++++++
+
+* Bugfixes
+
+0.9.10 (2011-06-22)
++++++++++++++++++++
+
+* Bugfixes
+
0.9.9 (2011-06-21)
++++++++++++++++++
diff --git a/tablib/core.py b/tablib/core.py
index 252c1ab..53f3767 100644
--- a/tablib/core.py
+++ b/tablib/core.py
@@ -18,8 +18,8 @@ from tablib.compat import OrderedDict
__title__ = 'tablib'
-__version__ = '0.9.10'
-__build__ = 0x000910
+__version__ = '0.9.11'
+__build__ = 0x000911
__author__ = 'Kenneth Reitz'
__license__ = 'MIT'
__copyright__ = 'Copyright 2011 Kenneth Reitz'
@@ -617,11 +617,9 @@ class Dataset(object):
See :ref:`dyncols` for an in-depth example.
"""
- col = list(col)
-
# Callable Columns...
- if len(col) == 1 and hasattr(col[0], '__call__'):
- col = list(map(col[0], self._data))
+ if hasattr(col, '__call__'):
+ col = list(map(col, self._data))
col = self._clean_col(col)
self._validate(col=col)