diff -r b619531ddbd2 -r ea73a6e39d19 web/test/unittest_views_baseviews.py --- a/web/test/unittest_views_baseviews.py Fri Apr 23 12:40:48 2010 +0200 +++ b/web/test/unittest_views_baseviews.py Fri Apr 23 12:19:54 2010 +0200 @@ -5,11 +5,6 @@ :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses """ -try: - from json import loads -except ImportError: - from simplejson import loads - from logilab.common.testlib import unittest_main from logilab.mtconverter import html_unescape @@ -17,6 +12,8 @@ from cubicweb.web.htmlwidgets import TableWidget from cubicweb.web.views import vid_from_rset +from cubicweb.web import json +loads = json.loads def loadjson(value): return loads(html_unescape(value))