diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | tablib/formats/_tsv.py | 4 | ||||
| -rw-r--r-- | tablib/formats/_yaml.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 82a9a9f..b45810f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,6 @@ python: - 2.6 - 2.7 - 3.2 -install: python setup.py install +install: + - python setup.py install script: python test_tablib.py diff --git a/tablib/formats/_tsv.py b/tablib/formats/_tsv.py index 816b6e3..8ef2b67 100644 --- a/tablib/formats/_tsv.py +++ b/tablib/formats/_tsv.py @@ -34,9 +34,9 @@ def import_set(dset, in_stream, headers=True): dset.wipe() if is_py3: - rows = csv.reader(in_stream.split('\r\n'), delimiter='\t') + rows = csv.reader(in_stream.splitlines(), delimiter='\t') else: - rows = csv.reader(in_stream.split('\r\n'), delimiter='\t', + rows = csv.reader(in_stream.splitlines(), delimiter='\t', encoding=DEFAULT_ENCODING) for i, row in enumerate(rows): diff --git a/tablib/formats/_yaml.py b/tablib/formats/_yaml.py index 91a3baa..e2ccf46 100644 --- a/tablib/formats/_yaml.py +++ b/tablib/formats/_yaml.py @@ -46,7 +46,7 @@ def import_book(dbook, in_stream): dbook.wipe() - for sheet in yaml.safe_load(in_stream): + for sheet in yaml.load(in_stream): data = tablib.Dataset() data.title = sheet['title'] data.dict = sheet['data'] |