branch | stable |
changeset 5389 | 809d3b5b3d31 |
parent 5377 | 84d14ddfae13 |
child 5421 | 8167de96c523 |
--- a/test/unittest_utils.py Fri Apr 23 14:55:10 2010 +0200 +++ b/test/unittest_utils.py Fri Apr 23 12:19:54 2010 +0200 @@ -14,11 +14,7 @@ from cubicweb.utils import make_uid, UStringIO, SizeConstrainedList, RepeatList try: - try: - import json - except ImportError: - import simplejson as json - from cubicweb.utils import CubicWebJsonEncoder + from cubicweb.utils import CubicWebJsonEncoder, json except ImportError: json = None