web/views/basecontrollers.py
changeset 5408 120db445c179
parent 5385 b6e250dd7a7d
parent 5389 809d3b5b3d31
child 5423 e15abfdcce38
--- a/web/views/basecontrollers.py	Fri Apr 23 17:56:01 2010 +0200
+++ b/web/views/basecontrollers.py	Mon Apr 26 16:31:46 2010 +0200
@@ -10,10 +10,7 @@
 """
 __docformat__ = "restructuredtext en"
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+from smtplib import SMTP
 
 from logilab.common.decorators import cached
 from logilab.common.date import strptime
@@ -23,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 Redirect, RemoteCallFailed, DirectResponse, json_dumps
+from cubicweb.web import Redirect, RemoteCallFailed, DirectResponse, json_dumps, json
 from cubicweb.web.controller import Controller
 from cubicweb.web.views import vid_from_rset, formrenderers