diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-01-31 01:35:52 -0500 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-01-31 01:35:52 -0500 |
| commit | 26b6faa88d0c272f7f8153cbd2de6ce451e22caf (patch) | |
| tree | ef25c2f5969cfa88d4802243a588e753a2118834 /tablib/formats/_json.py | |
| parent | 7727171379683dcf859a344d6c8a43dc6d5cfa2b (diff) | |
| parent | 140736ff332ff164f18821ec150488b1a2092898 (diff) | |
| download | tablib-0.9.3.tar.gz | |
Merge branch 'release/0.9.3'v0.9.3
Diffstat (limited to 'tablib/formats/_json.py')
| -rw-r--r-- | tablib/formats/_json.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index da31b23..7f31ee5 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -26,11 +26,11 @@ def export_set(dataset): def export_book(databook): """Returns JSON representation of Databook.""" return json.dumps(databook._package()) - + def import_set(dset, in_stream): """Returns dataset from JSON stream.""" - + dset.wipe() dset.dict = json.loads(in_stream) @@ -52,4 +52,4 @@ def detect(stream): json.loads(stream) return True except ValueError: - return False
\ No newline at end of file + return False |