# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1234947915 -3600
# Node ID e044f28372bdf261125729e2aa7ac147f1b87616
# Parent  0c0dfd33a76d1dbfa71d9d31dc3873f1683fb622
chainall / chainfirst ensures selectors are instantiated

diff -r 0c0dfd33a76d -r e044f28372bd selectors.py
--- a/selectors.py	Wed Feb 18 10:03:58 2009 +0100
+++ b/selectors.py	Wed Feb 18 10:05:15 2009 +0100
@@ -347,7 +347,7 @@
 @lltrace
 def authenticated_user(cls, req, *args, **kwargs):
     """accept if user is authenticated"""
-    return not anonymous_user(cls, req, *args, **kwargs)
+    return not anonymous_user()(cls, req, *args, **kwargs)
 
 @objectify_selector
 @lltrace
diff -r 0c0dfd33a76d -r e044f28372bd vregistry.py
--- a/vregistry.py	Wed Feb 18 10:03:58 2009 +0100
+++ b/vregistry.py	Wed Feb 18 10:05:15 2009 +0100
@@ -693,7 +693,9 @@
     will be the sum of each selector'score
     """
     assert selectors
-    selector = AndSelector(*selectors)
+    # XXX do we need to create the AndSelector here, a tuple might be enough
+    selector = AndSelector(*[_instantiate_selector(selector)
+                             for selector in selectors])
     if 'name' in kwargs:
         selector.__name__ = kwargs['name']
     return selector
@@ -704,7 +706,8 @@
     will be the first non-zero selector score
     """
     assert selectors
-    selector = OrSelector(*selectors)
+    selector = OrSelector(*[_instantiate_selector(selector)
+                            for selector in selectors])
     if 'name' in kwargs:
         selector.__name__ = kwargs['name']
     return selector