Permalink
Browse files

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

…ed by Pierre-Olivier Latour.
  • Loading branch information...
1 parent c5b872a commit 8d4ce91d58abc5b8c28372470be9b2c64f1c453b @stephenlb stephenlb committed Nov 11, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 google-app-engine/python/Pubnub.py
View
6 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():

0 comments on commit 8d4ce91

Please sign in to comment.