# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1234910430 -3600 # Node ID 50a99184cf473a78f4e8c77dbc4c4fe7f4eff0bd # Parent f76e89b52553640b3b247c5f3cf874fcbef2c423 update some imports diff -r f76e89b52553 -r 50a99184cf47 server/hooksmanager.py --- a/server/hooksmanager.py Tue Feb 17 23:34:17 2009 +0100 +++ b/server/hooksmanager.py Tue Feb 17 23:40:30 2009 +0100 @@ -181,7 +181,7 @@ # self.register_hook(tidy_html_fields('before_update_entity'), 'before_update_entity', '') from cubicweb.selectors import yes -from cubicweb.common.appobject import AppObject +from cubicweb.appobject import AppObject class autoid(type): """metaclass to create an unique 'id' attribute on the class using it""" diff -r f76e89b52553 -r 50a99184cf47 web/action.py --- a/web/action.py Tue Feb 17 23:34:17 2009 +0100 +++ b/web/action.py Tue Feb 17 23:40:30 2009 +0100 @@ -10,7 +10,7 @@ from cubicweb.selectors import (relation_possible, match_search_state, one_line_rset, may_add_relation, yes, accepts_compat, condition_compat, deprecate) -from cubicweb.common.appobject import AppRsetObject +from cubicweb.appobject import AppRsetObject from cubicweb.common.registerers import accepts_registerer _ = unicode diff -r f76e89b52553 -r 50a99184cf47 web/controller.py --- a/web/controller.py Tue Feb 17 23:34:17 2009 +0100 +++ b/web/controller.py Tue Feb 17 23:40:30 2009 +0100 @@ -12,7 +12,7 @@ from cubicweb import typed_eid from cubicweb.common.registerers import priority_registerer from cubicweb.selectors import yes, require_group_compat -from cubicweb.common.appobject import AppObject +from cubicweb.appobject import AppObject from cubicweb.web import LOGGER, Redirect, RequestError diff -r f76e89b52553 -r 50a99184cf47 web/facet.py --- a/web/facet.py Tue Feb 17 23:34:17 2009 +0100 +++ b/web/facet.py Tue Feb 17 23:40:30 2009 +0100 @@ -20,9 +20,8 @@ from cubicweb import Unauthorized, typed_eid from cubicweb.selectors import match_context_prop, one_has_relation +from cubicweb.appobject import AppRsetObject from cubicweb.common.registerers import priority_registerer -from cubicweb.common.appobject import AppRsetObject -from cubicweb.common.utils import AcceptMixIn from cubicweb.web.htmlwidgets import HTMLWidget ## rqlst manipulation functions used by facets ################################ @@ -234,7 +233,7 @@ ## base facet classes ######################################################### -class AbstractFacet(AcceptMixIn, AppRsetObject): +class AbstractFacet(AppRsetObject): __registerer__ = priority_registerer __abstract__ = True __registry__ = 'facets' diff -r f76e89b52553 -r 50a99184cf47 web/views/urlrewrite.py --- a/web/views/urlrewrite.py Tue Feb 17 23:34:17 2009 +0100 +++ b/web/views/urlrewrite.py Tue Feb 17 23:40:30 2009 +0100 @@ -1,13 +1,13 @@ """Rules based url rewriter component, to get configurable RESTful urls :organization: Logilab -:copyright: 2007-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ import re +from cubicweb.appobject import AppObject from cubicweb.common.registerers import accepts_registerer -from cubicweb.common.appobject import AppObject def rgx(pattern, flags=0):