Switch to chunked XML parsing after initial stream negotiation is done.

Ben Weaver · Ben Weaver · commit ee41075ff2be · 2010-02-05T13:33:09.000-05:00
diff --git a/xmpp/core.py b/xmpp/core.py
@@ -57,6 +57,14 @@ def listen(self):
 
         return self
 
+    def activate(self):
+        """Default plugin activation is done after basic Features have
+        been negotiated."""
+
+        self.parser.stop_tokenizing()
+        self.state.activate()
+        return self
+
     def on_stream_secured(self, tls):
         self.secured = True
 
@@ -390,7 +398,6 @@ def __init__(self, **options):
             not options.get('server_side')
             or (options.get('keyfile') and options.get('certfile'))
         )
-        print 'active?', options, self._active
 
     def active(self):
         return self._active and self.use_tls()
@@ -612,7 +619,7 @@ def handle_open_stream(self, attr):
         self.state.trigger(ReceivedOpenStream).run(self._opened)
 
     def _opened(self):
-        self.state.one(SessionStarted, thunk(self.state.activate))
+        self.state.one(SessionStarted, thunk(self.activate))
         self.wait_for_features()
 
     ### ---------- Outgoing Stream ----------
@@ -637,7 +644,7 @@ def handle_open_stream(self, attr):
     def _opened(self):
         self.open_stream()
         if not self.send_features():
-            self.state.activate()
+            self.activate()
 
     def handle_stanza(self, elem):
         if self.authJID:
diff --git a/xmpp/xml.py b/xmpp/xml.py
@@ -51,6 +51,7 @@ def __init__(self, target, **kwargs):
         self.target = target
         self.parser = etree.XMLParser(target=target, **kwargs)
         self.rb = ''
+        self.feed = self.feed_tokens
         self.stop = False
         self.more = False
 
@@ -67,14 +68,11 @@ def reset(self):
         return self
 
     def stop_tokenizing(self):
-        if self.rb is not None:
-            if self.rb:
-                self.parser.feed(self.rb)
-            self.rb = None
+        if self.feed == self.feed_tokens:
             self.feed = self.parser.feed
         return self
 
-    def feed(self, data):
+    def feed_tokens(self, data):
         ## This method buffers data and carefully feeds tokens from
         ## the buffer into the parser.  The parser target may reset
         ## the parser while a particular token is being handled, so if
