changeset 5385 | b6e250dd7a7d |
parent 5302 | dfd147de06b2 |
parent 5377 | 84d14ddfae13 |
child 5408 | 120db445c179 |
--- a/web/request.py Fri Apr 23 11:10:30 2010 +0200 +++ b/web/request.py Fri Apr 23 12:42:53 2010 +0200 @@ -16,7 +16,10 @@ from urlparse import urlsplit from itertools import count -from simplejson import dumps +try: + from json import dumps +except ImportError: + from simplejson import dumps from rql.utils import rqlvar_maker