diff -r 105011657405 -r e0ab7433e640 web/__init__.py --- a/web/__init__.py Fri Apr 23 17:31:46 2010 +0200 +++ b/web/__init__.py Fri Apr 23 17:32:47 2010 +0200 @@ -10,10 +10,14 @@ __docformat__ = "restructuredtext en" _ = unicode -try: - from json import dumps -except ImportError: - from simplejson import dumps +import sys +if sys.version_info < (2,6): + import simplejson as json +else: + import json + +dumps = json.dumps + from urllib import quote as urlquote from logilab.common.deprecation import deprecated