--- a/entities/adapters.py Wed Jun 09 09:42:52 2010 +0200
+++ b/entities/adapters.py Wed Jun 09 09:58:23 2010 +0200
@@ -21,6 +21,8 @@
__docformat__ = "restructuredtext en"
+from logilab.mtconverter import TransformError
+
from cubicweb.view import EntityAdapter, implements_adapter_compat
from cubicweb.selectors import implements, relation_possible
from cubicweb.interfaces import IDownloadable
--- a/etwist/server.py Wed Jun 09 09:42:52 2010 +0200
+++ b/etwist/server.py Wed Jun 09 09:58:23 2010 +0200
@@ -401,6 +401,7 @@
if sys.platform == 'win32':
raise ConfigurationError("Under windows, you must use the service management "
"commands (e.g : 'net start my_instance)'")
+ from logilab.common.daemon import daemonize
LOGGER.info('instance started in the background on %s', root_resource.base_url)
if daemonize(config['pid-file']):
return # child process
--- a/web/controller.py Wed Jun 09 09:42:52 2010 +0200
+++ b/web/controller.py Wed Jun 09 09:58:23 2010 +0200
@@ -25,6 +25,7 @@
from cubicweb.selectors import yes
from cubicweb.appobject import AppObject
+from cubicweb.mail import format_mail
from cubicweb.web import LOGGER, Redirect, RequestError
--- a/web/views/massmailing.py Wed Jun 09 09:42:52 2010 +0200
+++ b/web/views/massmailing.py Wed Jun 09 09:58:23 2010 +0200
@@ -25,7 +25,8 @@
from cubicweb.selectors import (implements, authenticated_user,
adaptable, match_form_params)
from cubicweb.view import EntityView
-from cubicweb.web import stdmsgs, controller, action, form, formfields as ff
+from cubicweb.web import (Redirect, stdmsgs, controller, action,
+ form, formfields as ff)
from cubicweb.web.formwidgets import CheckBox, TextInput, AjaxWidget, ImgButton
from cubicweb.web.views import forms, formrenderers
--- a/web/views/treeview.py Wed Jun 09 09:42:52 2010 +0200
+++ b/web/views/treeview.py Wed Jun 09 09:58:23 2010 +0200
@@ -21,6 +21,7 @@
__docformat__ = "restructuredtext en"
from warnings import warn
+from itertools import chain
from logilab.mtconverter import xml_escape
from logilab.common.decorators import cached