diff options
| author | Iuri de Silvio <iurisilvio@gmail.com> | 2016-12-18 19:09:26 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 19:09:26 -0200 |
| commit | 52e547daf9ae120b6e07331e8c5791bb88f911c6 (patch) | |
| tree | 4a00603e89e1c0913ba7e57927b7c3f9e68aed69 /tablib | |
| parent | 7f0b7a0a22281e4f61605e8cec9e50a63170d513 (diff) | |
| parent | 91d3299280a57a6780c446c21a506f6259552c0a (diff) | |
| download | tablib-52e547daf9ae120b6e07331e8c5791bb88f911c6.tar.gz | |
Merge pull request #259 from dyve/master
Fix #260 date and datetime export to JSON
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/formats/_json.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index 777040a..fb66745 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -5,8 +5,10 @@ import tablib -import sys -from tablib.packages import omnijson as json +try: + import json +except ImportError: + from tablib.packages import omnijson as json title = 'json' |