diff -r 2c3f14bc2590 -r 84d14ddfae13 web/test/unittest_views_baseviews.py --- a/web/test/unittest_views_baseviews.py Thu Apr 22 19:37:56 2010 +0000 +++ b/web/test/unittest_views_baseviews.py Thu Apr 22 19:48:04 2010 +0000 @@ -5,7 +5,10 @@ :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses """ -from simplejson import loads +try: + from json import loads +except ImportError: + from simplejson import loads from logilab.common.testlib import unittest_main from logilab.mtconverter import html_unescape