summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-25 02:11:31 -0400
committerChris McDonough <chrism@plope.com>2012-08-25 02:11:31 -0400
commitcc33a518a124883a41cadba13fb3dc4d07dfd43d (patch)
treec838bd13d75c9b4f1c55200d4d087b69c596fdb1
parenta0547ef9d05fd6ed724d1c64a57a0063b7f1f87a (diff)
downloadpyramid-cc33a518a124883a41cadba13fb3dc4d07dfd43d.tar.gz
pyramid-cc33a518a124883a41cadba13fb3dc4d07dfd43d.tar.bz2
pyramid-cc33a518a124883a41cadba13fb3dc4d07dfd43d.zip
subscribers registered for more than one interface receive all objects, which is fucking stupid, but true
-rw-r--r--pyramid/config/adapters.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index f0ed40e4c..01438fd30 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -69,9 +69,9 @@ class AdaptersConfiguratorMixin(object):
def _derive_subscriber(self, subscriber, predicates):
if not predicates:
return subscriber
- def subscriber_wrapper(event):
- if all((predicate(event) for predicate in predicates)):
- return subscriber(event)
+ def subscriber_wrapper(*arg):
+ if all((predicate(*arg) for predicate in predicates)):
+ return subscriber(*arg)
if hasattr(subscriber, '__name__'):
update_wrapper(subscriber_wrapper, subscriber)
return subscriber_wrapper