web/views/timeline.py
branchstable
changeset 5389 809d3b5b3d31
parent 5377 84d14ddfae13
child 5421 8167de96c523
--- a/web/views/timeline.py	Fri Apr 23 14:55:10 2010 +0200
+++ b/web/views/timeline.py	Fri Apr 23 12:19:54 2010 +0200
@@ -9,16 +9,12 @@
 """
 __docformat__ = "restructuredtext en"
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 from logilab.mtconverter import xml_escape
 
 from cubicweb.interfaces import ICalendarable
 from cubicweb.selectors import implements
 from cubicweb.view import EntityView, StartupView
+from cubicweb.web import json
 
 _ = unicode