summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/compat.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/pyramid/compat.py b/pyramid/compat.py
index aaf042917..484cb7b97 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -207,13 +207,9 @@ try:
from StringIO import StringIO as NativeIO
except ImportError: # pragma: no cover
from io import StringIO as NativeIO
-
-try:
- import json
-except ImportError: # pragma: no cover
- try:
- import simplejson as json
- except NotImplementedError:
- from django.utils import simplejson as json # GAE
+
+# "json" is not an API; it's here to support older pyramid_debugtoolbar
+# versions which attempt to import it
+import json