updated Google App Engine python API with imporved JSON import provid…

…ed by Pierre-Olivier Latour.
pubnub · Nov 11, 2011 · 8d4ce91 · 8d4ce91
1 parent c5b872a
commit 8d4ce91
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/google-app-engine/python/Pubnub.py b/google-app-engine/python/Pubnub.py
@@ -13,7 +13,11 @@
 import hashlib
 import urllib2
 
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
+
 from google.appengine.api import urlfetch
 
 class Pubnub():