diff -r 544609e83317 -r 96752791c2b6 server/rqlannotation.py --- a/server/rqlannotation.py Mon Mar 23 17:38:30 2009 +0100 +++ b/server/rqlannotation.py Mon Mar 23 17:55:59 2009 +0100 @@ -2,18 +2,16 @@ code generation. :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" from logilab.common.compat import any -from rql.nodes import Relation, Exists, VariableRef, Constant, Variable, Or +from rql.nodes import Relation, VariableRef, Constant, Variable, Or from rql.utils import common_parent -from cubicweb import server - def _annotate_select(annotator, rqlst): for subquery in rqlst.with_: annotator._annotate_union(subquery.query)