# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1234911807 -3600
# Node ID ac4a94e50b6006cf6986dc840466e955945defaa
# Parent  9062cdc140a970863fef31c0c14b4a003ba048fb
some more s/__selectors__/__select__ but still more to come

diff -r 9062cdc140a9 -r ac4a94e50b60 goa/appobjects/components.py
--- a/goa/appobjects/components.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/goa/appobjects/components.py	Wed Feb 18 00:03:27 2009 +0100
@@ -30,7 +30,7 @@
     """
     id = 'search-associate'
     
-    __selectors__ = (one_line_rset, match_search_state('linksearch'), accept)
+    __select__ = one_line_rset() & match_search_state('linksearch') & accept
 
     def cell_call(self, row, col):
         entity = self.entity(0, 0)
diff -r 9062cdc140a9 -r ac4a94e50b60 selectors.py
--- a/selectors.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/selectors.py	Wed Feb 18 00:03:27 2009 +0100
@@ -949,7 +949,7 @@
         if getattr(cls, 'require_groups', None):
             warn('use "match_user_groups(group1, group2)" instead of using require_groups',
                  DeprecationWarning)
-            cls.__select__ &= (match_user_groups(cls.require_groups),)
+            cls.__select__ &= match_user_groups(cls.require_groups)
         return cls
     return plug_selector
 
@@ -960,7 +960,7 @@
         if getattr(cls, 'accepts', None):
             warn('use "match_user_groups(group1, group2)" instead of using require_groups',
                  DeprecationWarning)
-            cls.__select__ &= (implements(*cls.accepts),)
+            cls.__select__ &= implements(*cls.accepts)
         return cls
     return plug_selector
 
@@ -971,7 +971,7 @@
         if getattr(cls, 'condition', None):
             warn('use "use rql_condition(expression)" instead of using condition',
                  DeprecationWarning)
-            cls.__select__ &= (rql_condition(cls.condition),)
+            cls.__select__ &= rql_condition(cls.condition)
         return cls
     return plug_selector
      
@@ -982,8 +982,8 @@
         if getattr(cls, 'type', None):
             warn('use relation_possible selector instead of using etype_rtype',
                  DeprecationWarning)
-            cls.__select__ &= (relation_possible(cls.rtype, role(cls),
-                                                 getattr(cls, 'etype', None),
-                                                 action=getattr(cls, 'require_permission', 'read')))
+            cls.__select__ &= relation_possible(cls.rtype, role(cls),
+                                                getattr(cls, 'etype', None),
+                                                action=getattr(cls, 'require_permission', 'read'))
         return cls
     return plug_selector
diff -r 9062cdc140a9 -r ac4a94e50b60 web/views/eproperties.py
--- a/web/views/eproperties.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/web/views/eproperties.py	Wed Feb 18 00:03:27 2009 +0100
@@ -13,7 +13,7 @@
 
 from cubicweb.selectors import (one_line_rset, none_rset, implements,
                                 match_user_groups, chainfirst, chainall)
-<from cubicweb.common.utils import UStringIO
+from cubicweb.common.utils import UStringIO
 from cubicweb.common.view import StartupView
 from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs
 from cubicweb.web.views import baseviews
diff -r 9062cdc140a9 -r ac4a94e50b60 web/views/ibreadcrumbs.py
--- a/web/views/ibreadcrumbs.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/web/views/ibreadcrumbs.py	Wed Feb 18 00:03:27 2009 +0100
@@ -71,7 +71,7 @@
 
 class BreadCrumbComponent(BreadCrumbEntityVComponent):
     __registry__ = 'components'
-    __selectors__ = (one_line_rset, implement_interface)
+    __select__ = (one_line_rset() & implements(IBreadCrumbs))
     visible = True
 
 
diff -r 9062cdc140a9 -r ac4a94e50b60 web/views/management.py
--- a/web/views/management.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/web/views/management.py	Wed Feb 18 00:03:27 2009 +0100
@@ -174,7 +174,7 @@
 
 class ErrorView(AnyRsetView):
     """default view when no result has been found"""
-    __selectors__ = yes
+    __select__ = yes()
     id = 'error'
 
     def page_title(self):
diff -r 9062cdc140a9 -r ac4a94e50b60 web/views/wdoc.py
--- a/web/views/wdoc.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/web/views/wdoc.py	Wed Feb 18 00:03:27 2009 +0100
@@ -85,7 +85,7 @@
 # help views ##################################################################
 
 class InlineHelpView(StartupView):
-    __selectors__ = match_form_params('fid')
+    __select__ = match_form_params('fid')
     id = 'wdoc'
     title = _('site documentation')
     
@@ -163,7 +163,7 @@
 
 class InlineHelpImageView(StartupView):
     id = 'wdocimages'
-    __selectors__ = match_form_params('fid')
+    __select__ = match_form_params('fid')
     binary = True
     templatable = False
     content_type = 'image/png'
diff -r 9062cdc140a9 -r ac4a94e50b60 web/views/xbel.py
--- a/web/views/xbel.py	Tue Feb 17 23:54:30 2009 +0100
+++ b/web/views/xbel.py	Wed Feb 18 00:03:27 2009 +0100
@@ -9,6 +9,7 @@
 
 from logilab.mtconverter import html_escape
 
+from cubicweb.selectors import implements
 from cubicweb.web.views.baseviews import XmlView, EntityView