diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-11 14:41:02 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-11 14:41:02 -0500 |
| commit | d68f850b513f0daad984d87c5ff0714753e7c815 (patch) | |
| tree | 1b2d632932cf9510dc66ccff7930586a7e0c64ff | |
| parent | 19d1ebeaa504d94d5483c16bbc5a39aef8342a88 (diff) | |
| download | pyramid-d68f850b513f0daad984d87c5ff0714753e7c815.tar.gz pyramid-d68f850b513f0daad984d87c5ff0714753e7c815.tar.bz2 pyramid-d68f850b513f0daad984d87c5ff0714753e7c815.zip | |
readd json back, but not as an API (only because older versions of debug toolbar depend on its existence)
| -rw-r--r-- | pyramid/compat.py | 9 |
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 + + |