diff options
| author | Maciej "RooTer" Urbański <rooter@kyberian.net> | 2018-09-12 21:15:20 +0200 |
|---|---|---|
| committer | Iuri de Silvio <iurisilvio@gmail.com> | 2018-09-12 16:15:20 -0300 |
| commit | 4f8949417e5126f8416b61d7feb6cd666bae4fb9 (patch) | |
| tree | d905cc5d23ce027f372c4811600b23df4ba2d34e /tablib | |
| parent | 3d5943a8a43a721bea1f3e33dc669a581a095c53 (diff) | |
| download | tablib-4f8949417e5126f8416b61d7feb6cd666bae4fb9.tar.gz | |
ujson presence no longer breaks tablib (resolves #297) (#311)
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/formats/_json.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index a3b88f8..bbd2c96 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -3,14 +3,11 @@ """ Tablib - JSON Support """ import decimal +import json from uuid import UUID import tablib -try: - import ujson as json -except ImportError: - import json title = 'json' extensions = ('json', 'jsn') |