Browse Source

if simplejson isn't available, fallback to json

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
73f0c7a574
  1. 4
      pyweb/mumble/tests.py
  2. 4
      pyweb/mumble/views.py

4
pyweb/mumble/tests.py

@ -57,7 +57,11 @@
# * Log messages: yes
# * Instance scope: ALL
try:
import simplejson
except ImportError:
import json as simplejson
from django.conf import settings
from django.test import TestCase
from django.test.client import Client

4
pyweb/mumble/views.py

@ -15,7 +15,11 @@
* GNU General Public License for more details.
"""
try:
import simplejson
except ImportError:
import json as simplejson
from StringIO import StringIO
from PIL import Image

Loading…
Cancel
Save