mirror of
https://github.com/kennethreitz/tablib.git
synced 2026-06-05 23:10:17 +00:00
Updated elegant imports for instance properties.
Data wipes.
This commit is contained in:
@@ -25,17 +25,15 @@ def export_set(dataset):
|
||||
return stream.getvalue()
|
||||
|
||||
|
||||
def import_set(in_stream, headers=True):
|
||||
def import_set(dset, in_stream, headers=True):
|
||||
"""Returns dataset from CSV stream."""
|
||||
|
||||
data = tablib.core.Dataset()
|
||||
dset.wipe()
|
||||
|
||||
rows = csv.reader(in_stream.split())
|
||||
for i, row in enumerate(rows):
|
||||
|
||||
if (i == 0) and (headers):
|
||||
data.headers = row
|
||||
dset.headers = row
|
||||
else:
|
||||
data.append(row)
|
||||
|
||||
return data
|
||||
dset.append(row)
|
||||
|
||||
@@ -17,13 +17,11 @@ def export_book(databook):
|
||||
return json.dumps(databook._package())
|
||||
|
||||
|
||||
def import_set(in_stream):
|
||||
def import_set(dset, in_stream):
|
||||
"""Returns dataset from JSON stream."""
|
||||
|
||||
data = tablib.core.Dataset()
|
||||
data.dict = json.loads(in_stream)
|
||||
|
||||
return data
|
||||
dset.wipe()
|
||||
dset.dict = json.loads(in_stream)
|
||||
|
||||
|
||||
def import_book(in_stream):
|
||||
|
||||
@@ -5,7 +5,7 @@ import cStringIO
|
||||
|
||||
|
||||
title = 'xls'
|
||||
extentions = ('xls')
|
||||
extentions = ('xls',)
|
||||
|
||||
|
||||
def export_set(dataset):
|
||||
|
||||
@@ -18,13 +18,11 @@ def export_book(databook):
|
||||
return yaml.dump(databook._package())
|
||||
|
||||
|
||||
def import_set(in_stream):
|
||||
def import_set(dset):
|
||||
"""Returns dataset from YAML stream."""
|
||||
|
||||
data = tablib.core.Dataset()
|
||||
data.dict = yaml.load(in_stream)
|
||||
|
||||
return data
|
||||
dset.wipe()
|
||||
dset.dict = yaml.load(in_stream)
|
||||
|
||||
|
||||
def import_book(in_stream):
|
||||
|
||||
Reference in New Issue
Block a user