diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-03-23 03:55:23 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-03-23 03:55:23 -0400 |
| commit | c5bbc74b96cc04254c39f8586e4d976a98b8d02a (patch) | |
| tree | c8a6b5b9073d6f031f54f02434a43aa50b35caf3 /tablib/formats | |
| parent | 7f5342a1b87aa231f96c134f4d04611b74fee2ee (diff) | |
| download | tablib-c5bbc74b96cc04254c39f8586e4d976a98b8d02a.tar.gz | |
import magic
Diffstat (limited to 'tablib/formats')
| -rw-r--r-- | tablib/formats/_json.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index 262c627..8d498df 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -3,8 +3,13 @@ """ Tablib - JSON Support """ -import tablib.core -from tablib.packages import anyjson +import tablib + +import sys +if sys.version_info[:2] > (2, 5): + from tablib.packages import anyjson +else: + from tablib.packages import anyjson25 as anyjson @@ -34,7 +39,7 @@ def import_book(dbook, in_stream): dbook.wipe() for sheet in anyjson.deserialize(in_stream): - data = tablib.core.Dataset() + data = tablib.Dataset() data.title = sheet['title'] data.dict = sheet['data'] dbook.add_sheet(data) |