kennethreitz/tablib
1
0
Fork 0
mirror of https://github.com/kennethreitz/tablib.git synced 2026-06-05 23:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'compat' into feature/compat

Browse Source
This commit is contained in:
Kenneth Reitz
2011-05-12 17:24:35 -04:00
parent 79fb82d69d 11bca4f7a2
commit c65fd4201f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tablib/core.py
+4 -4
View File
@@ -13,7 +13,6 @@ from copy import copy
from operator import itemgetter
from tablib import formats
import collections
from tablib.compat import OrderedDict
@@ -276,7 +275,8 @@ class Dataset(object):
else:
header = []
if len(col) == 1 and isinstance(col[0], collections.Callable):
if len(col) == 1 and hasattr(col[0], '__call__'):
col = list(map(col[0], self._data))
col = tuple(header + col)
@@ -547,7 +547,7 @@ class Dataset(object):
col = list(col)
# Callable Columns...
if len(col) == 1 and isinstance(col[0], collections.Callable):
if len(col) == 1 and hasattr(col[0], '__call__'):
col = list(map(col[0], self._data))
col = self._clean_col(col)
@@ -793,7 +793,7 @@ def import_set(stream):
format.import_set(data, stream)
return data
except AttributeError as e:
except AttributeError:
return None