diff -r e651d5f24cb5 -r b01dd0ef43aa cubicweb/web/facet.py --- a/cubicweb/web/facet.py Wed Mar 13 13:37:49 2019 +0100 +++ b/cubicweb/web/facet.py Thu Mar 14 14:43:18 2019 +0100 @@ -63,7 +63,6 @@ from logilab.common.graph import has_path from logilab.common.decorators import cached, cachedproperty from logilab.common.date import datetime2ticks, ustrftime, ticks2datetime -from logilab.common.deprecation import deprecated from logilab.common.registry import yes from rql import nodes, utils @@ -89,12 +88,6 @@ return req.vreg['facets'].object_by_id(facetid, req, select=select, filtered_variable=filtered_variable) -@deprecated('[3.13] filter_hiddens moved to cubicweb.web.views.facets with ' - 'slightly modified prototype') -def filter_hiddens(w, baserql, **kwargs): - from cubicweb.web.views.facets import filter_hiddens - return filter_hiddens(w, baserql, wdgs=kwargs.pop('facets'), **kwargs) - ## rqlst manipulation functions used by facets ################################ @@ -164,15 +157,6 @@ # global tree config: DISTINCT, LIMIT, OFFSET select.set_distinct(True) -@deprecated('[3.13] use init_facets instead') -def prepare_facets_rqlst(rqlst, args=None): - assert len(rqlst.children) == 1, 'FIXME: union not yet supported' - select = rqlst.children[0] - filtered_variable = get_filtered_variable(select) - baserql = select.as_string(args) - prepare_select(select, filtered_variable) - return filtered_variable, baserql - def prepare_vocabulary_select(select, filtered_variable, rtype, role, select_target_entity=True): """prepare a syntax tree to generate a filter vocabulary rql using the given @@ -370,11 +354,6 @@ return var -_prepare_vocabulary_rqlst = deprecated('[3.13] renamed prepare_vocabulary_select')( - prepare_vocabulary_select) -_cleanup_rqlst = deprecated('[3.13] renamed to cleanup_select')(cleanup_select) - - ## base facet classes ########################################################## class AbstractFacet(AppObject): @@ -479,11 +458,6 @@ def wdgclass(self): raise NotImplementedError - @property - @deprecated('[3.13] renamed .select') - def rqlst(self): - return self.select - class VocabularyFacet(AbstractFacet): """This abstract class extend :class:`AbstractFacet` to use the