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,8 +1,18 @@
 History
 -------
 
-0.9.9 (?)
-+++++++++
+0.9.11 (2011-06-30)
++++++++++++++++++++
+
+* Bugfixes
+
+0.9.10 (2011-06-22)
++++++++++++++++++++
+
+* Bugfixes
+
+0.9.9 (2011-06-21)
+++++++++++++++++++
 
 * Dataset API Changes
 * ``stack_rows`` => ``stack``, ``stack_columns`` => ``stack_cols``

docs/_themes/kr/static/flasky.css_t

@@ -462,3 +462,9 @@ a:hover tt {
     background-color: #ccc;
     -webkit-border-radius: 3px;
 }
+
+/* misc. */
+
+.revsys-inline {
+    display: none!important;
+}

setup.py

@@ -12,6 +12,13 @@ except ImportError:
     from distutils.core import setup, find_packages
 
 
+packages = find_packages(exclude=('docs',))
+
+if sys.version_info[:2] < (3,0):
+    packages = [p for p in packages if '3' not in p]
+else:
+    packages = [p for p in packages if '2' not in p]
+
 if sys.argv[-1] == 'publish':
     os.system("python setup.py sdist upload")
     sys.exit()
@@ -45,7 +52,7 @@ setup(
     author='Kenneth Reitz',
     author_email='me@kennethreitz.com',
     url='http://tablib.org',
-    packages=find_packages(exclude=('docs',)),
+    packages=packages,
     license='MIT',
     classifiers=(
         'Development Status :: 5 - Production/Stable',

tablib/__init__.py

@@ -1,5 +1,4 @@
-""" Tablib.
-"""
+""" Tablib. """
 
 from tablib.core import (
     Databook, Dataset, detect, import_set,

tablib/core.py

@@ -18,8 +18,8 @@ from tablib.compat import OrderedDict
 
 
 __title__ = 'tablib'
-__version__ = '0.9.9'
-__build__ = 0x000909
+__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)

toy.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import tablib
+
+d = tablib.Dataset()
+
+with open('/Users/kreitz/Desktop/test.json') as f:
+    d.json = f.read()
+
+# del d[900:]
+
+# print d.height
+
+print len(d.ods)
+