Merge pull request #347 from edx/ned/simplesjson

There's no such module as simplesjson #334
openedx · May 5, 2016 · 4379a7e · 4379a7e
2 parents 55a2d8b + edf770a
commit 4379a7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xblock/exceptions.py b/xblock/exceptions.py
@@ -3,7 +3,7 @@
 """
 from webob import Response
 try:
-    import simplesjson as json  # pylint: disable=F0401
+    import simplejson as json   # pylint: disable=F0401
 except ImportError:
     import json
 

diff --git a/xblock/mixins.py b/xblock/mixins.py
@@ -11,7 +11,7 @@
 from collections import OrderedDict
 
 try:
-    import simplesjson as json  # pylint: disable=F0401
+    import simplejson as json   # pylint: disable=F0401
 except ImportError:
     import json
 import warnings