Fix iterable substanzas when added as normal plugin.

If an iterable plugin was an enabled, it wasn't added to
the iterables list.

2 files changed, 13 insertions, 8 deletions

diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 6f27c361..389fe20c 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -290,12 +290,11 @@ class ElementBase(object):
         # Initialize values using provided XML
         for child in self.xml.getchildren():
             if child.tag in self.plugin_tag_map:
-                plugin = self.plugin_tag_map[child.tag]
-                self.plugins[plugin.plugin_attrib] = plugin(child, self)
-            for sub in self.plugin_iterables:
-                if child.tag == "{%s}%s" % (sub.namespace, sub.name):
-                    self.iterables.append(sub(child, self))
-                    break
+                plugin_class = self.plugin_tag_map[child.tag]
+                plugin = plugin_class(child, self)
+                self.plugins[plugin.plugin_attrib] = plugin
+                if plugin_class in self.plugin_iterables:
+                    self.iterables.append(plugin)
 
     def setup(self, xml=None):
         """Initialize the stanza's XML contents.
@@ -346,7 +345,10 @@ class ElementBase(object):
         """
         if attrib not in self.plugins:
             plugin_class = self.plugin_attrib_map[attrib]
-            self.plugins[attrib] = plugin_class(parent=self)
+            plugin = plugin_class(parent=self)
+            self.plugins[attrib] = plugin
+            if plugin_class in self.plugin_iterables:
+                self.iterables.append(plugin)
         return self
 
     def _get_stanza_values(self):
diff --git a/tests/test_stanza_element.py b/tests/test_stanza_element.py
index dc67d1c5..f7ec59c0 100644
--- a/tests/test_stanza_element.py
+++ b/tests/test_stanza_element.py
@@ -68,7 +68,10 @@ class TestElementBase(SleekTest):
                     'baz': '',
                     'foo2': {'bar': '',
                              'baz': 'b'},
-                    'substanzas': [{'__childtag__': '{foo}subfoo',
+                    'substanzas': [{'__childtag__': '{foo}foo2',
+                                    'bar': '',
+                                    'baz': 'b'},
+                                   {'__childtag__': '{foo}subfoo',
                                     'bar': 'c',
                                     'baz': ''}]}
         self.failUnless(values == expected,