diff -r b619531ddbd2 -r ea73a6e39d19 web/__init__.py --- a/web/__init__.py Fri Apr 23 12:40:48 2010 +0200 +++ b/web/__init__.py Fri Apr 23 12:19:54 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