diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-12 18:18:57 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-12 18:18:57 -0500 |
| commit | 4b4ef7befce479bde5caffb823cc028312cd833e (patch) | |
| tree | d55ff8113cb5799c7e610b91d91d8d7a58b4f681 | |
| parent | 2c44394a496ec2c9caa7362d7e37e5f414c860bd (diff) | |
| download | pyramid-4b4ef7befce479bde5caffb823cc028312cd833e.tar.gz pyramid-4b4ef7befce479bde5caffb823cc028312cd833e.tar.bz2 pyramid-4b4ef7befce479bde5caffb823cc028312cd833e.zip | |
rejigger json
| -rw-r--r-- | pyramid/compat.py | 12 |
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 |