diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-02-17 16:31:52 -0500 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-02-17 16:31:52 -0500 |
| commit | ccb29c68fa814424f9fc761fc6ab3d24779a8cc6 (patch) | |
| tree | fb91e7b7526e8c80a82af527ce8d0e810f34d815 /tablib/formats/_json.py | |
| parent | e077a7f2bc8b37b36ac0da569c244f977c400254 (diff) | |
| download | tablib-ccb29c68fa814424f9fc761fc6ab3d24779a8cc6.tar.gz | |
*shutter* making everyone else happy
Diffstat (limited to 'tablib/formats/_json.py')
| -rw-r--r-- | tablib/formats/_json.py | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index 7f31ee5..51cc207 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -4,12 +4,12 @@ """ try: - import json # load system JSON (Python >= 2.6) + import json # load system JSON (Python >= 2.6) except ImportError: - try: - import simplejson as json - except ImportError: - import tablib.packages.simplejson as json # use the vendorized copy + try: + import simplejson as json + except ImportError: + import tablib.packages.simplejson as json # use the vendorized copy import tablib.core @@ -19,37 +19,37 @@ extentions = ('json', 'jsn') def export_set(dataset): - """Returns JSON representation of Dataset.""" - return json.dumps(dataset.dict) + """Returns JSON representation of Dataset.""" + return json.dumps(dataset.dict) def export_book(databook): - """Returns JSON representation of Databook.""" - return json.dumps(databook._package()) + """Returns JSON representation of Databook.""" + return json.dumps(databook._package()) def import_set(dset, in_stream): - """Returns dataset from JSON stream.""" + """Returns dataset from JSON stream.""" - dset.wipe() - dset.dict = json.loads(in_stream) + dset.wipe() + dset.dict = json.loads(in_stream) def import_book(dbook, in_stream): - """Returns databook from JSON stream.""" + """Returns databook from JSON stream.""" - dbook.wipe() - for sheet in json.loads(in_stream): - data = tablib.core.Dataset() - data.title = sheet['title'] - data.dict = sheet['data'] - dbook.add_sheet(data) + dbook.wipe() + for sheet in json.loads(in_stream): + data = tablib.core.Dataset() + data.title = sheet['title'] + data.dict = sheet['data'] + dbook.add_sheet(data) def detect(stream): - """Returns True if given stream is valid JSON.""" - try: - json.loads(stream) - return True - except ValueError: - return False + """Returns True if given stream is valid JSON.""" + try: + json.loads(stream) + return True + except ValueError: + return False |
