From d68f850b513f0daad984d87c5ff0714753e7c815 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 11 Nov 2011 14:41:02 -0500
Subject: readd json back, but not as an API (only because older versions of
 debug toolbar depend on its existence)

---
 pyramid/compat.py | 9 +++++++++
 1 file changed, 9 insertions(+)

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
+
+    
-- 
cgit v1.2.3