From: deyk <deyk@crossway.org>
Date: Wed, 11 Apr 2012 21:51:54 +0000 (-0700)
Subject: Moved `merge` argument into `**kwargs`.
X-Git-Tag: 22.4~35
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/95d7d2c185aed481717d333e386dc0afc8465e19?ds=inline;hp=-c

Moved `merge` argument into `**kwargs`.
---

95d7d2c185aed481717d333e386dc0afc8465e19
diff --git a/cas_provider/views.py b/cas_provider/views.py
index fdae99f..675150b 100644
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -26,7 +26,8 @@ def _build_service_url(service, ticket):
         return service + '&ticket=' + ticket
 
 
-def login(request, template_name='cas/login.html', success_redirect='/account/', merge=False):
+def login(request, template_name='cas/login.html', success_redirect='/account/', **kwargs):
+    merge = kwargs.get('merge', False)
     logging.debug('CAS Provider Login view. Method is %s, merge is %s, template is %s.',
                   request.method, merge, template_name)