--- a/web/test/unittest_views_baseviews.py Fri Apr 23 11:10:30 2010 +0200
+++ b/web/test/unittest_views_baseviews.py Fri Apr 23 12:42:53 2010 +0200
@@ -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