--- a/web/httpcache.py Wed Feb 18 10:21:10 2009 +0100
+++ b/web/httpcache.py Wed Feb 18 10:21:15 2009 +0100
@@ -2,7 +2,7 @@
:organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
"""
__docformat__ = "restructuredtext en"
@@ -92,7 +92,7 @@
# monkey patching, so view doesn't depends on this module and we have all
# http cache related logic here
-from cubicweb.common import view
+from cubicweb import view
def set_http_cache_headers(self):
self.http_cache_manager(self).set_headers()
--- a/web/views/basecontrollers.py Wed Feb 18 10:21:10 2009 +0100
+++ b/web/views/basecontrollers.py Wed Feb 18 10:21:15 2009 +0100
@@ -19,8 +19,8 @@
from cubicweb import NoSelectableObject, ValidationError, typed_eid
from cubicweb.selectors import yes, match_user_groups
+from cubicweb.view import STRICT_DOCTYPE, CW_XHTML_EXTENSIONS
from cubicweb.common.mail import format_mail
-from cubicweb.common.view import STRICT_DOCTYPE, CW_XHTML_EXTENSIONS
from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed
from cubicweb.web.controller import Controller
from cubicweb.web.views import vid_from_rset
--- a/web/views/tableview.py Wed Feb 18 10:21:10 2009 +0100
+++ b/web/views/tableview.py Wed Feb 18 10:21:15 2009 +0100
@@ -12,11 +12,11 @@
from logilab.mtconverter import html_escape
from cubicweb.selectors import nonempty_rset, match_form_params, accept_rset
-from cubicweb.common.utils import make_uid
+from cubicweb.utils import make_uid
+from cubicweb.view import EntityView, AnyRsetView
from cubicweb.common.uilib import toggle_action, limitsize, jsonize, htmlescape
-from cubicweb.common.view import EntityView, AnyRsetView
from cubicweb.web.htmlwidgets import (TableWidget, TableColumn, MenuWidget,
- PopupBoxMenu, BoxLink)
+ PopupBoxMenu, BoxLink)
from cubicweb.web.facet import prepare_facets_rqlst, filter_hiddens
class TableView(AnyRsetView):