diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
| commit | 484efff156e344fc3ca1a7377539132b702c0c78 (patch) | |
| tree | fa051515b9dc15eb3a5ab1a8e8b9c2e25b920d17 /sleekxmpp/features/feature_mechanisms | |
| parent | 89cffd43f48cfc835b70e137776eb8c2e73a0b67 (diff) | |
| parent | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 (diff) | |
| download | slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.gz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.bz2 slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.xz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.zip | |
Merge branch 'develop' into roster
Conflicts:
setup.py
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms')
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/mechanisms.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py index d60818bb..a6cff0a0 100644 --- a/sleekxmpp/features/feature_mechanisms/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py @@ -29,6 +29,7 @@ class feature_mechanisms(base_plugin): self.description = "SASL Stream Feature" self.stanza = stanza + self.use_mech = self.config.get('use_mech', None) def tls_active(): return 'starttls' in self.xmpp.features @@ -49,7 +50,8 @@ class feature_mechanisms(base_plugin): username=self.xmpp.boundjid.user, sec_query=suelta.sec_query_allow, request_values=sasl_callback, - tls_active=tls_active) + tls_active=tls_active, + mech=self.use_mech) register_stanza_plugin(StreamFeatures, stanza.Mechanisms) diff --git a/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py b/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py index 1189cd80..c09cafbd 100644 --- a/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py @@ -42,9 +42,9 @@ class Mechanisms(ElementBase): """ self.del_mechanisms() for val in values: - mech = ET.Element('{%s}mechanism' % self.namespace) - mech.text = val - self.append(mech) + mech = ET.Element('{%s}mechanism' % self.namespace) + mech.text = val + self.append(mech) def del_mechanisms(self): """ |