PROTON-1680: Handle various string inputs for allowed SASL mechanisms and add docs
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e4b5a4fe Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e4b5a4fe Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e4b5a4fe Branch: refs/heads/go1 Commit: e4b5a4fef1c7f31d11dbec62f40110141c373e49 Parents: d80a792 Author: Justin Ross <[email protected]> Authored: Fri Dec 8 09:35:00 2017 -0800 Committer: Justin Ross <[email protected]> Committed: Fri Dec 8 09:35:00 2017 -0800 ---------------------------------------------------------------------- proton-c/bindings/python/proton/__init__.py | 2 +- proton-c/bindings/python/proton/reactor.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e4b5a4fe/proton-c/bindings/python/proton/__init__.py ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py index ddc7d3e..3671e2b 100644 --- a/proton-c/bindings/python/proton/__init__.py +++ b/proton-c/bindings/python/proton/__init__.py @@ -3573,7 +3573,7 @@ class SASL(Wrapper): return outcome def allowed_mechs(self, mechs): - pn_sasl_allowed_mechs(self._sasl, mechs) + pn_sasl_allowed_mechs(self._sasl, unicode2utf8(mechs)) def _get_allow_insecure_mechs(self): return pn_sasl_get_allow_insecure_mechs(self._sasl) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e4b5a4fe/proton-c/bindings/python/proton/reactor.py ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py index 537b280..c210a8f 100644 --- a/proton-c/bindings/python/proton/reactor.py +++ b/proton-c/bindings/python/proton/reactor.py @@ -713,14 +713,15 @@ class Container(Reactor): called to process any events in the scope of this connection or its child links - @param kwargs: sasl_enabled, which determines whether a sasl layer is - used for the connection; allowed_mechs an optional list of SASL - mechanisms to allow if sasl is enabled; allow_insecure_mechs a flag + @param kwargs: sasl_enabled, which determines whether a sasl + layer is used for the connection; allowed_mechs an optional + string containing a space-separated list of SASL mechanisms to + allow if sasl is enabled; allow_insecure_mechs a flag indicating whether insecure mechanisms, such as PLAIN over a - non-encrypted socket, are allowed; 'virtual_host' the hostname to set - in the Open performative used by peer to determine the correct - back-end service for the client. If 'virtual_host' is not supplied the - host field from the URL is used instead." + non-encrypted socket, are allowed; 'virtual_host' the hostname + to set in the Open performative used by peer to determine the + correct back-end service for the client. If 'virtual_host' is + not supplied the host field from the URL is used instead." """ conn = self.connection(handler) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
