From 3931bcb4e689fa986899f722d40b34406ef7f11e Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 6 Oct 2010 14:27:05 -0400 Subject: [PATCH] Added vendorized JSON. --- tablib/formats/_json.py | 7 +++++-- 1 file 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