diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-25 12:12:04 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-25 12:12:04 -0400 |
| commit | 707164e45946f30f7b194159b7630c10771be0a4 (patch) | |
| tree | 9bbbff3488bb69df8c0999cf06e4b70b4ffad48f /tablib | |
| parent | 42f0a285c33eef9370a87f8bd8c4c71360758025 (diff) | |
| download | tablib-707164e45946f30f7b194159b7630c10771be0a4.tar.gz | |
fixes #17
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/compat.py | 2 | ||||
| -rw-r--r-- | tablib/formats/_json.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tablib/compat.py b/tablib/compat.py index 0881369..cb083f9 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -26,6 +26,7 @@ if is_py3: from tablib.packages import markup3 as markup from tablib.packages import openpyxl3 as openpyxl from tablib.packages.odf3 import opendocument, style, text, table + from tablib.packages import anyjson import csv from io import StringIO @@ -45,5 +46,6 @@ else: from tablib.packages.odf import opendocument, style, text, table from tablib.packages import unicodecsv as csv + from tablib.packages import anyjson25 as anyjson unicode = unicode
\ No newline at end of file diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index 8d498df..7e298e1 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -6,11 +6,7 @@ import tablib import sys -if sys.version_info[:2] > (2, 5): - from tablib.packages import anyjson -else: - from tablib.packages import anyjson25 as anyjson - +from tablib.compat import anyjson title = 'json' |