Merge branch 'develop'

AUTHORS

@@ -15,4 +15,5 @@ Patches and Suggestions
 - Luca Beltrame
 - Benjamin Wohlwend
 - Erik Youngren
-- Mark Rogers
+- Mark Rogers
+- Mark Walling

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)
 ++++++++++++++++++
 

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)