From f02b0564e0cf664364cd6694a5df6d588071ec62 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 8 Apr 2011 16:51:24 -0400
Subject: [PATCH 1/2] Update tests to reflect XEP-0086 correcting error codes.

---
 tests/test_stanza_error.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py
index e1c7d5a..5eecfee 100644
--- a/tests/test_stanza_error.py
+++ b/tests/test_stanza_error.py
@@ -9,7 +9,7 @@ class TestErrorStanzas(SleekTest):
         msg.enable('error')
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="cancel" code="501">
               <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -22,7 +22,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="cancel" code="404">
               <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -34,7 +34,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -50,7 +50,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text>
             </error>
           </message>
@@ -66,7 +66,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>

From 1d891858b63c1e3ac10a39920c3e65159cfc8d72 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Mon, 11 Apr 2011 14:22:32 -0400
Subject: [PATCH 2/2] Mark scheduler thread as a daemon.

---
 sleekxmpp/xmlstream/scheduler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index 0e711b4..12deedd 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -132,6 +132,7 @@ class Scheduler(object):
         if threaded:
             self.thread = threading.Thread(name='sheduler_process',
                                            target=self._process)
+            self.thread.daemon = True
             self.thread.start()
         else:
             self._process()