From b37655199a42622dec88ba11f845cc78d2ed0e8c Mon Sep 17 00:00:00 2001 From: Jason Bittel Date: Mon, 15 Aug 2016 08:57:57 -0700 Subject: [PATCH] Join callback lists returned from backends --- mama_cas/services/__init__.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mama_cas/services/__init__.py b/mama_cas/services/__init__.py index aa8fb82..b2ce94d 100644 --- a/mama_cas/services/__init__.py +++ b/mama_cas/services/__init__.py @@ -20,25 +20,21 @@ def _is_allowed(attr, *args): def get_callbacks(service): + callbacks = [] for backend in _get_backends(): try: - callbacks = backend.get_callbacks(service) + callbacks = callbacks + backend.get_callbacks(service) except AttributeError: raise NotImplementedError("%s does not implement get_callbacks()" % backend) - if callbacks: - # TODO merge callback dicts? - return callbacks - return [] + return callbacks def get_logout_url(service): for backend in _get_backends(): try: - logout_url = backend.get_logout_url(service) + return backend.get_logout_url(service) except AttributeError: raise NotImplementedError("%s does not implement get_logout_url()" % backend) - if logout_url: - return logout_url return None