diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2010-10-06 14:27:05 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2010-10-06 14:27:05 -0400 |
| commit | 3931bcb4e689fa986899f722d40b34406ef7f11e (patch) | |
| tree | e1bb9957a504c6bd8ef867c71f1a167acdf24f45 /tablib/formats/_json.py | |
| parent | 471e56c387591e2dec5ed949a6d2f6aa3e5f43f8 (diff) | |
| download | tablib-3931bcb4e689fa986899f722d40b34406ef7f11e.tar.gz | |
Added vendorized JSON.
Diffstat (limited to 'tablib/formats/_json.py')
| -rw-r--r-- | tablib/formats/_json.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py index 5619316..da31b23 100644 --- a/tablib/formats/_json.py +++ b/tablib/formats/_json.py @@ -4,9 +4,12 @@ """ try: - import json + import json # load system JSON (Python >= 2.6) except ImportError: - import simplejson as json + try: + import simplejson as json + except ImportError: + import tablib.packages.simplejson as json # use the vendorized copy import tablib.core |