summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/compat.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/pyramid/compat.py b/pyramid/compat.py
index 80da8097e..aaf042917 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -208,3 +208,12 @@ try:
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
+
+