web/views/basecontrollers.py
branchstable
changeset 5389 809d3b5b3d31
parent 5377 84d14ddfae13
child 5408 120db445c179
child 5421 8167de96c523
--- a/web/views/basecontrollers.py	Fri Apr 23 14:55:10 2010 +0200
+++ b/web/views/basecontrollers.py	Fri Apr 23 12:19:54 2010 +0200
@@ -12,11 +12,6 @@
 
 from smtplib import SMTP
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 from logilab.common.decorators import cached
 from logilab.common.date import strptime
 
@@ -25,7 +20,7 @@
 from cubicweb.utils import CubicWebJsonEncoder
 from cubicweb.selectors import authenticated_user, match_form_params
 from cubicweb.mail import format_mail
-from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed, json_dumps
+from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed, json_dumps, json
 from cubicweb.web.controller import Controller
 from cubicweb.web.views import vid_from_rset
 from cubicweb.web.views.formrenderers import FormRenderer