diff options
author | Roland Hedberg <roland.hedberg@adm.umu.se> | 2013-05-24 17:57:55 +0200 |
---|---|---|
committer | Roland Hedberg <roland.hedberg@adm.umu.se> | 2013-05-24 17:57:55 +0200 |
commit | 77e5a407a52a380cff191ffcf5d74c8cf095b27d (patch) | |
tree | 2ca5fc337363a15be829c35067b3f838231c951e /src/saml2 | |
parent | 3d4cdebfdbb3fb32ca91579521704ecf65d8abba (diff) | |
download | pysaml2-77e5a407a52a380cff191ffcf5d74c8cf095b27d.tar.gz |
Return is a protected python word so it can not be used as a parameter name in a method definition.
These fixes are there to allow for the usage or return_url or return as parameter name.
Diffstat (limited to 'src/saml2')
-rw-r--r-- | src/saml2/client_base.py | 10 | ||||
-rw-r--r-- | src/saml2/discovery.py | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/saml2/client_base.py b/src/saml2/client_base.py index a17f9783..e1550c96 100644 --- a/src/saml2/client_base.py +++ b/src/saml2/client_base.py @@ -707,12 +707,20 @@ class Base(Entity): :return: A URL """ args = {"entityID": entity_id} - for key in ["return", "policy", "returnIDParam"]: + for key in ["policy", "returnIDParam"]: try: args[key] = kwargs[key] except KeyError: pass + try: + args["return"] = kwargs["return_url"] + except KeyError: + try: + args["return"] = kwargs["return"] + except KeyError: + pass + if "isPassive" in kwargs: if kwargs["isPassive"]: args["isPassive"] = "true" diff --git a/src/saml2/discovery.py b/src/saml2/discovery.py index 26b9de90..160b3940 100644 --- a/src/saml2/discovery.py +++ b/src/saml2/discovery.py @@ -62,9 +62,12 @@ class DiscoveryServer(Entity): # ------------------------------------------------------------------------- - def create_discovery_service_response(self, return_url, + def create_discovery_service_response(self, return_url=None, returnIDParam="entityID", - entity_id=None): + entity_id=None, **kwargs): + if return_url is None: + return_url = kwargs["return"] + if entity_id: qp = urlencode({returnIDParam: entity_id}) |