summaryrefslogtreecommitdiff
path: root/tablib/formats
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2010-10-06 12:23:30 -0400
committerKenneth Reitz <me@kennethreitz.com>2010-10-06 12:23:30 -0400
commit9dfd9d0c8e93f27ea0268d907ce82709892a4fac (patch)
tree4bae31e89e769b14eb740cea64d7f954cbd14578 /tablib/formats
parent140e23c980bda39df77cf17c1d4fe103083bc6a1 (diff)
downloadtablib-9dfd9d0c8e93f27ea0268d907ce82709892a4fac.tar.gz
Rely on built-in JSON.
Diffstat (limited to 'tablib/formats')
-rw-r--r--tablib/formats/_json.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
index f7c88ee..fbc3758 100644
--- a/tablib/formats/_json.py
+++ b/tablib/formats/_json.py
@@ -3,7 +3,11 @@
""" Tablib - JSON Support
"""
-import simplejson as json
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
import tablib.core
title = 'json'