summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/stanzabase.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-10 11:07:25 -0700
committerLance Stout <lancestout@gmail.com>2012-10-10 11:07:25 -0700
commit675c0112ac935896e0d2a1674647c17884c62973 (patch)
treeb2e49b41e701d00fc7847dcd7a1e9891b1cddaff /sleekxmpp/xmlstream/stanzabase.py
parent4dd2c15775735b6cfe177a1d801c20bc4140a5c4 (diff)
downloadslixmpp-675c0112ac935896e0d2a1674647c17884c62973.tar.gz
slixmpp-675c0112ac935896e0d2a1674647c17884c62973.tar.bz2
slixmpp-675c0112ac935896e0d2a1674647c17884c62973.tar.xz
slixmpp-675c0112ac935896e0d2a1674647c17884c62973.zip
Correct handling deleting plugins when xml:lang is active.
Diffstat (limited to 'sleekxmpp/xmlstream/stanzabase.py')
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 4f58953b..08ce702a 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -662,7 +662,7 @@ class ElementBase(object):
full_attrib = attrib
attrib_lang = ('%s|' % attrib).split('|')
attrib = attrib_lang[0]
- lang = attrib_lang[1] or ''
+ lang = attrib_lang[1] or None
kwargs = {}
if lang and attrib in self.lang_interfaces:
@@ -738,7 +738,7 @@ class ElementBase(object):
full_attrib = attrib
attrib_lang = ('%s|' % attrib).split('|')
attrib = attrib_lang[0]
- lang = attrib_lang[1] or ''
+ lang = attrib_lang[1] or None
kwargs = {}
if lang and attrib in self.lang_interfaces:
@@ -824,7 +824,7 @@ class ElementBase(object):
full_attrib = attrib
attrib_lang = ('%s|' % attrib).split('|')
attrib = attrib_lang[0]
- lang = attrib_lang[1] or ''
+ lang = attrib_lang[1] or None
kwargs = {}
if lang and attrib in self.lang_interfaces:
@@ -862,7 +862,7 @@ class ElementBase(object):
del plugin[full_attrib]
del self.plugins[(attrib, None)]
else:
- del self.plugins[(attrib, lang)]
+ del self.plugins[(attrib, plugin['lang'])]
self.loaded_plugins.remove(attrib)
try:
self.xml.remove(plugin.xml)