- cosmetics

12 files changed, 111 insertions, 110 deletions

diff --git a/tests/all.py b/tests/all.py
index 34e0423..7434bb3 100755
--- a/tests/all.py
+++ b/tests/all.py
@@ -20,7 +20,7 @@ def usage():
     print "Usage:"
     print "  %s [-v <verbosity>] " % (sys.argv[0],)
     print "  %s -h"
-    
+
 def main(args=None):
     verbosity=1
     if args:
@@ -42,3 +42,4 @@ def main(args=None):
 
 if __name__ == '__main__':
     main(sys.argv[1:])
+# vi: sts=4 et sw=4
diff --git a/tests/cache.py b/tests/cache.py
index a994eb0..0f2d445 100755
--- a/tests/cache.py
+++ b/tests/cache.py
@@ -47,49 +47,49 @@ class TestCacheItem(unittest.TestCase):
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"fresh")
-        
+
         sleep(0.01)
         # t+~0.01
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"fresh")
-        
+
         sleep(0.1)
         # t+~0.11
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"old")
- 
+
         sleep(0.01)
         # t+~0.12
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"old")
-        
+
         sleep(0.1)
         # t+~0.22
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"stale")
-       
+
         sleep(0.01)
         # t+~0.23
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"stale")
-       
+
         sleep(0.1)
         # t+~0.33
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"purged")
-        
+
         sleep(0.1)
         # t+~0.43
         state = item.update_state()
         self.failUnlessEqual(state,item.state)
         self.failUnlessEqual(item.state,"purged")
- 
+
 class TestCacheFetcher(unittest.TestCase):
     def setUp(self):
         self.cache = Cache(100)
@@ -102,13 +102,13 @@ class TestCacheFetcher(unittest.TestCase):
 
     def object_handler(self, address, value, state):
         self.event = ("success", address, value, state)
-        
+
     def error_handler(self, address, error_data):
         self.event = ("error", address, error_data)
-        
+
     def timeout_handler(self, address):
         self.event = ("timeout", address)
-        
+
     def test_fetcher_fetch(self):
         fetcher = self.make_fetcher()
         self.failUnlessRaises(RuntimeError,fetcher.fetch)
@@ -120,7 +120,7 @@ class TestCacheFetcher(unittest.TestCase):
         self.event = None
         fetcher.got_it("test_value")
         self.failUnlessEqual(self.event, None)
-    
+
     def test_success_other_state(self):
         fetcher = self.make_fetcher()
         fetcher.got_it("test_value","stale")
@@ -133,7 +133,7 @@ class TestCacheFetcher(unittest.TestCase):
         self.event = None
         fetcher.error("test_error")
         self.failUnlessEqual(self.event, None)
- 
+
     def test_timeout(self):
         fetcher = self.make_fetcher()
         fetcher.timeout()
@@ -178,7 +178,7 @@ class TestCache(unittest.TestCase):
         self.failUnless(gitem3 is item3, "gitem2=%r item2=%r" % (gitem2, item2))
         gitem1 = cache.get_item("test_addr1","new")
         self.failUnless(gitem1 is None, "gitem1=%r" % (gitem1,))
-        
+
     def test_max_items(self):
         cache = Cache(10)
         self.failUnlessEqual(cache.num_items(),0,"number of items: "+`cache.num_items()`)
@@ -297,7 +297,7 @@ class TestCache(unittest.TestCase):
         cache = Cache(100)
         cache.set_fetcher(self.Fetcher)
         cache.request_object(1, "fresh", self.object_handler,
-                self.error_handler, self.timeout_handler, 
+                self.error_handler, self.timeout_handler,
                 timeout=timedelta(seconds=0.1))
         self.failUnlessEqual(self.event,None,"Early event: %r" % (self.event,))
         sleep(0.05)
@@ -315,10 +315,10 @@ class TestCache(unittest.TestCase):
 
     def object_handler(self, address, value, state):
         self.event = ("success", address, value, state)
-        
+
     def error_handler(self, address, error_data):
         self.event = ("error", address, error_data)
-        
+
     def timeout_handler(self, address):
         self.event = ("timeout", address)
 
@@ -341,13 +341,13 @@ class TestCacheSuite(unittest.TestCase):
                     self.got_it(self.cls(self.address))
                 else:
                     self.error("Negative address")
-                    
+
         class MyFetcher1(MyFetcher):
             cls = TestClass1
-        
+
         class MyFetcher2(MyFetcher):
             cls = TestClass2
-        
+
         self.Fetcher1 = MyFetcher1
         self.Fetcher2 = MyFetcher2
 
@@ -355,7 +355,7 @@ class TestCacheSuite(unittest.TestCase):
         cache = CacheSuite(100)
         cache.register_fetcher(TestClass1, self.Fetcher1)
         cache.register_fetcher(TestClass2, self.Fetcher2)
-        
+
         cache.request_object(TestClass1, 1, "fresh", self.object_handler,
                 self.error_handler, self.timeout_handler)
         self.failUnlessEqual(self.event,None,"Early event: %r" % (self.event,))
@@ -384,14 +384,14 @@ class TestCacheSuite(unittest.TestCase):
 
     def object_handler(self, address, value, state):
         self.event = ("success", address, value, state)
-        
+
     def error_handler(self, address, error_data):
         self.event = ("error", address, error_data)
-        
+
     def timeout_handler(self, address):
         self.event = ("timeout", address)
 
-     
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestCacheItem))
@@ -403,4 +403,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/dataforms.py b/tests/dataforms.py
index a9f3a3c..1cb3f89 100755
--- a/tests/dataforms.py
+++ b/tests/dataforms.py
@@ -37,19 +37,19 @@ class TestForm(unittest.TestCase):
         self.check_form_iter(form, jep4_example2_fields)
 
     def test_jep4_example2_build_inc(self):
-        form = self.build_form_inc("form", u"Bot Configuration", 
+        form = self.build_form_inc("form", u"Bot Configuration",
                 u"Fill out this form to configure your new bot!", jep4_example2_fields)
         self.check_form_info(form, jep4_example2_info)
         self.check_form_iter(form, jep4_example2_fields)
 
     def test_jep4_example2_build_direct(self):
-        form = self.build_form_direct("form", u"Bot Configuration", 
+        form = self.build_form_direct("form", u"Bot Configuration",
                 u"Fill out this form to configure your new bot!", jep4_example2_fields)
         self.check_form_info(form, jep4_example2_info)
         self.check_form_iter(form, jep4_example2_fields)
 
     def test_jep4_example2_as_xml(self):
-        form = self.build_form_inc("form", u"Bot Configuration", 
+        form = self.build_form_inc("form", u"Bot Configuration",
                 u"Fill out this form to configure your new bot!", jep4_example2_fields)
         xml = form.as_xml().serialize()
         form = self.parse_form(xml)
@@ -61,9 +61,9 @@ class TestForm(unittest.TestCase):
         form['public'].value = True
         sform = form.make_submit()
         self.check_form_info(sform, ("submit", None, None))
-        submitted_fields = [ 
-                    (f[0], None, f[2], None, [], False, None) 
-                        for f in jep4_example2_fields 
+        submitted_fields = [
+                    (f[0], None, f[2], None, [], False, None)
+                        for f in jep4_example2_fields
                             if f[1]!="fixed" and (f[5] or f[2])
                 ]
         sform['public'].value = None
@@ -74,9 +74,9 @@ class TestForm(unittest.TestCase):
         form['public'].value = True
         sform = form.make_submit( keep_types = True )
         self.check_form_info(sform, ("submit", None, None))
-        submitted_fields = [ 
-                    (f[0], f[1], f[2], None, [], False, None) 
-                        for f in jep4_example2_fields 
+        submitted_fields = [
+                    (f[0], f[1], f[2], None, [], False, None)
+                        for f in jep4_example2_fields
                             if f[1]!="fixed" and (f[5] or f[2])
                 ]
         sform['public'].value = None
@@ -256,7 +256,7 @@ class TestForm(unittest.TestCase):
         self.failUnlessEqual(form.type, form_type)
         self.failUnlessEqual(form.title, title)
         self.failUnlessEqual(form.instructions, instructions)
-        
+
     def check_form_iter(self, form, field_data):
         form_iter = iter(form)
         for name, ftype, values, label, options, required, desc in field_data:
@@ -305,7 +305,7 @@ class TestForm(unittest.TestCase):
         doc = libxml2.parseDoc(xml)
         root = doc.getRootElement()
         return Form(root)
-        
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestForm))
@@ -560,4 +560,4 @@ jep4_example8_items = [
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/disco.py b/tests/disco.py
index ed0054d..cb3c5b6 100755
--- a/tests/disco.py
+++ b/tests/disco.py
@@ -26,13 +26,13 @@ test_features=[
 #    u"http://dżabber.example.com/example-namespace",
     ];
 test_features.sort()
- 
+
 notest_features=[
     u"another-test-feature",
     u"http://jabber.org/protocol/disco#items",
     u"http://dżabber.example.com/another-example-namespace",
     ];
-       
+
 
 class TestDiscoInfo(unittest.TestCase):
     def test_xml_input(self):
@@ -42,7 +42,7 @@ class TestDiscoInfo(unittest.TestCase):
         txt+="\n"+`di.features`+"\n"
         should_be=file("data/disco_info_in.txt").read()
         self.failUnlessEqual(txt,should_be)
-        
+
     def build_disco_info(self,node=None):
         di=disco.DiscoInfo(node)
         for name,category,type in test_identities:
@@ -55,7 +55,7 @@ class TestDiscoInfo(unittest.TestCase):
 
     def test_building(self):
         self.build_disco_info()
-    
+
     def test_building_with_node(self):
         di=self.build_disco_info("test")
         self.failUnlessEqual(di.node,"test")
@@ -133,7 +133,7 @@ class TestDiscoItems(unittest.TestCase):
 
     def test_building(self):
         self.build_disco_items()
-    
+
     def test_building_with_node(self):
         di=self.build_disco_items("test")
         self.failUnlessEqual(di.node,"test")
@@ -150,7 +150,7 @@ class TestDiscoItems(unittest.TestCase):
             self.failUnless(di.has_item(jid,node),"Item (%r,%r) not found" % (jid,node))
         for jid,node in notest_items:
             self.failIf(di.has_item(jid,node),"Item (%r,%r) found" % (jid,node))
-        
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestDiscoInfo))
@@ -160,4 +160,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/imports.py b/tests/imports.py
index 3dc03e2..f15e6ff 100755
--- a/tests/imports.py
+++ b/tests/imports.py
@@ -36,7 +36,7 @@ class TestImports(unittest.TestCase):
         from pyxmpp.jabberd import Component as n1
         import pyxmpp.jabberd.component as m2
         self.failUnless(n1 is m2.Component,"Component not imported correctly")
-     
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestImports))
@@ -45,4 +45,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/jid.py b/tests/jid.py
index e1e8e1b..c8e319c 100755
--- a/tests/jid.py
+++ b/tests/jid.py
@@ -17,13 +17,13 @@ valid_jids=[
     (u"jajcus@jabber.bnet.pl/Test",
         (u"jajcus",u"jabber.bnet.pl",u"Test")),
     (u"Jajcus@jaBBer.bnet.pl/Test",
-        (u"jajcus",u"jabber.bnet.pl",u"Test")), 
+        (u"jajcus",u"jabber.bnet.pl",u"Test")),
     (u"Jajcus@jaBBer.bnet.pl/test",
-        (u"jajcus",u"jabber.bnet.pl",u"test")), 
+        (u"jajcus",u"jabber.bnet.pl",u"test")),
     (u"jajcuś@dżabber.example.com/Test",
-        (u"jajcuś",u"dżabber.example.com",u"Test")), 
+        (u"jajcuś",u"dżabber.example.com",u"Test")),
     (u"JAJCUŚ@DŻABBER.EXAMPLE.COM/TEST",
-        (u"jajcuś",u"dżabber.example.com",u"TEST")), 
+        (u"jajcuś",u"dżabber.example.com",u"TEST")),
     (u"%s@%s/%s" % (u"x"*1023,u"x"*1023,u"x"*1023),
         (u"x"*1023,u"x"*1023,u"x"*1023)),
 ]
@@ -35,10 +35,10 @@ valid_tuples=[
     ((None,u"example.com","Test"),u"example.com/Test"),
     ((u"jajcus",u"jabber.bnet.pl",None),u"jajcus@jabber.bnet.pl"),
     ((u"jajcus",u"jabber.bnet.pl",u"Test"),u"jajcus@jabber.bnet.pl/Test"),
-    ((u"Jajcus",u"jaBBer.bnet.pl",u"Test"),u"jajcus@jabber.bnet.pl/Test"), 
-    ((u"Jajcus",u"jaBBer.bnet.pl",u"test"),u"jajcus@jabber.bnet.pl/test"), 
-    ((u"jajcuś",u"dżabber.example.com",u"Test"),u"jajcuś@dżabber.example.com/Test"), 
-    ((u"JAJCUŚ",u"DŻABBER.EXAMPLE.COM",u"TEST"),u"jajcuś@dżabber.example.com/TEST"), 
+    ((u"Jajcus",u"jaBBer.bnet.pl",u"Test"),u"jajcus@jabber.bnet.pl/Test"),
+    ((u"Jajcus",u"jaBBer.bnet.pl",u"test"),u"jajcus@jabber.bnet.pl/test"),
+    ((u"jajcuś",u"dżabber.example.com",u"Test"),u"jajcuś@dżabber.example.com/Test"),
+    ((u"JAJCUŚ",u"DŻABBER.EXAMPLE.COM",u"TEST"),u"jajcuś@dżabber.example.com/TEST"),
 ]
 
 invalid_jids=[
@@ -58,24 +58,24 @@ invalid_jids=[
 ]
 
 comparisions_true=[
-    'JID(u"a@b.c") == JID(u"a@b.c")', 
-    'JID(u"a@b.c") == JID(u"A@b.c")', 
-    'JID(u"a@b.c") != JID(u"b@b.c")', 
-    'JID(u"a@b.c") < JID(u"b@b.c")', 
-    'JID(u"b@b.c") > JID(u"a@b.c")', 
-    'JID(u"a@b.c") > None', 
-    'JID(u"1@b.c") > None', 
+    'JID(u"a@b.c") == JID(u"a@b.c")',
+    'JID(u"a@b.c") == JID(u"A@b.c")',
+    'JID(u"a@b.c") != JID(u"b@b.c")',
+    'JID(u"a@b.c") < JID(u"b@b.c")',
+    'JID(u"b@b.c") > JID(u"a@b.c")',
+    'JID(u"a@b.c") > None',
+    'JID(u"1@b.c") > None',
     'None < JID(u"1@b.c")',
 ]
 
 comparisions_false=[
-    'JID(u"a@b.c") != JID(u"a@b.c")', 
-    'JID(u"a@b.c") != JID(u"A@b.c")', 
-    'JID(u"a@b.c") == JID(u"b@b.c")', 
-    'JID(u"a@b.c") > JID(u"b@b.c")', 
-    'JID(u"b@b.c") < JID(u"a@b.c")', 
-    'JID(u"a@b.c") < None', 
-    'JID(u"1@b.c") < None', 
+    'JID(u"a@b.c") != JID(u"a@b.c")',
+    'JID(u"a@b.c") != JID(u"A@b.c")',
+    'JID(u"a@b.c") == JID(u"b@b.c")',
+    'JID(u"a@b.c") > JID(u"b@b.c")',
+    'JID(u"b@b.c") < JID(u"a@b.c")',
+    'JID(u"a@b.c") < None',
+    'JID(u"1@b.c") < None',
     'None > JID(u"1@b.c")',
 ]
 
@@ -124,4 +124,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/message.py b/tests/message.py
index 7d281e8..e35d0bd 100755
--- a/tests/message.py
+++ b/tests/message.py
@@ -47,7 +47,7 @@ class TestMessage(unittest.TestCase):
         self.failUnlessEqual(m.get_thread(), None)
         nodes = m.xpath_eval("t:payload",{"t":"http://pyxmpp.jabberstudio.org/xmlns/test"})
         self.failIf(nodes)
-    
+
     def test_message_full_from_xml(self):
         m = Message(message1_node)
         self.check_message_full(m)
@@ -63,7 +63,7 @@ class TestMessage(unittest.TestCase):
         self.check_message_empty( Message(node) )
         node, doc = self.xml_to_xml(doc)
         self.check_message_empty( Message(node) )
- 
+
     def test_message_full(self):
         m = Message(
                 from_jid = JID("source@example.com/res"),
@@ -82,7 +82,7 @@ class TestMessage(unittest.TestCase):
         self.check_message_full( Message(node) )
         xml = self.xml_to_xml(doc)
         self.check_message_full( Message(node) )
-   
+
     def stanza_to_xml(self, stanza):
         d = libxml2.newDoc("1.0")
         r = d.newChild(None, "root", None)
@@ -91,14 +91,14 @@ class TestMessage(unittest.TestCase):
         d.setRootElement(r)
         xml = stanza.xmlnode.docCopyNode(d, 1)
         r.addChild(xml)
-        return xml,d 
+        return xml,d
 
     def xml_to_xml(self, xml):
         d = libxml2.parseDoc(xml.serialize())
         r = d.getRootElement()
         xml = r.children
         return xml, d
-       
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestMessage))
@@ -107,4 +107,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/ns_operations.py b/tests/ns_operations.py
index 8718f47..3b255a1 100755
--- a/tests/ns_operations.py
+++ b/tests/ns_operations.py
@@ -56,12 +56,12 @@ output_root = output_doc.getRootElement()
 class TestReplaceNs(unittest.TestCase):
     def test_replace_ns(self):
         doc = libxml2.newDoc("1.0")
-        
+
         root = doc.newChild(None, "root", None)
         common_ns = root.newNs(xmlextra.COMMON_NS, None)
         root.setNs(common_ns)
         doc.setRootElement(root)
-        
+
         n = input_doc.getRootElement()
         input_ns = n.ns()
         n = n.children
@@ -74,15 +74,15 @@ class TestReplaceNs(unittest.TestCase):
                     xmlextra.replace_ns(n1, n1_ns, common_ns)
             n = n.next
         self.failUnless(xml_elements_equal(root, output_root))
- 
+
     def test_replace_null_ns(self):
         doc = libxml2.newDoc("1.0")
-        
+
         root = doc.newChild(None, "root", None)
         common_ns = root.newNs(xmlextra.COMMON_NS, None)
         root.setNs(common_ns)
         doc.setRootElement(root)
-        
+
         n = input_doc2.getRootElement()
         input_ns = n.ns()
         n = n.children
@@ -98,14 +98,14 @@ class TestReplaceNs(unittest.TestCase):
                     xmlextra.replace_ns(n1, n1_ns, common_ns)
             n = n.next
         self.failUnless(xml_elements_equal(root, output_root))
-        
+
     def test_safe_serialize(self):
         s1 = """<a xmlns="http://pyxmpp.jabberstudio.org/xmlns/test"><b a1="v1" xmlns="http://pyxmpp.jabberstudio.org/xmlns/test1" a2="v2"/></a>"""
         doc1 = libxml2.parseDoc(s1)
         root1 = doc1.getRootElement()
         el1 = root1.children
         el1.setNs(root1.ns())
-        
+
         #s = el1.serialize()
         s = xmlextra.safe_serialize(el1)
 
@@ -114,7 +114,7 @@ class TestReplaceNs(unittest.TestCase):
         doc2 = libxml2.parseDoc(s2)
         root2 = doc2.getRootElement()
         self.failUnless(xml_elements_equal(root1, root2))
-    
+
 
 def suite():
      suite = unittest.TestSuite()
@@ -124,4 +124,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/presence.py b/tests/presence.py
index a6c6931..e8e37d4 100755
--- a/tests/presence.py
+++ b/tests/presence.py
@@ -77,7 +77,7 @@ class TestPresence(unittest.TestCase):
         self.check_presence_empty( Presence(node) )
         node, doc = self.xml_to_xml(doc)
         self.check_presence_empty( Presence(node) )
- 
+
     def test_presence_full(self):
         p = Presence(
                 from_jid = JID("source@example.com/res"),
@@ -96,7 +96,7 @@ class TestPresence(unittest.TestCase):
         self.check_presence_full( Presence(node) )
         xml = self.xml_to_xml(doc)
         self.check_presence_full( Presence(node) )
-   
+
     def stanza_to_xml(self, stanza):
         d = libxml2.newDoc("1.0")
         r = d.newChild(None, "root", None)
@@ -105,14 +105,14 @@ class TestPresence(unittest.TestCase):
         d.setRootElement(r)
         xml = stanza.xmlnode.docCopyNode(d, 1)
         r.addChild(xml)
-        return xml,d 
+        return xml,d
 
     def xml_to_xml(self, xml):
         d = libxml2.parseDoc(xml.serialize())
         r = d.getRootElement()
         xml = r.children
         return xml, d
-       
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestPresence))
@@ -121,4 +121,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/register.py b/tests/register.py
index e323958..f8a1cb8 100755
--- a/tests/register.py
+++ b/tests/register.py
@@ -25,7 +25,7 @@ class TestRegister(unittest.TestCase):
         self.failUnlessEqual(register.username, u"")
         self.failUnlessEqual(register.password, u"")
         self.failUnlessEqual(register.email, u"")
-        
+
     def test_jep77_example2_get_form(self):
         register = self.parse_stanza(jep77_example2)
         form = register.get_form()
@@ -86,7 +86,7 @@ class TestRegister(unittest.TestCase):
         doc = libxml2.parseDoc(xml)
         root = doc.getRootElement()
         return Form(root)
- 
+
 def suite():
      suite = unittest.TestSuite()
      suite.addTest(unittest.makeSuite(TestRegister))
@@ -259,11 +259,11 @@ jep77_example17 = """
    </x>
  </iq>
 """
-    
+
 # end of test data
 ###################
 
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/stream_reader.py b/tests/stream_reader.py
index 047edb2..b856b83 100755
--- a/tests/stream_reader.py
+++ b/tests/stream_reader.py
@@ -26,7 +26,7 @@ def xml_elements_equal(a, b, ignore_level1_cdata = False):
         if ns1.content != ns2.content:
             print "Ns mismatch: %r, %r on %r, %r" % (ns1.content, ns2.content, a, b)
             return False
- 
+
     ap = a.properties
     bp = b.properties
     while 1:
@@ -40,7 +40,7 @@ def xml_elements_equal(a, b, ignore_level1_cdata = False):
             return False
         ap = ap.next
         bp = bp.next
-   
+
     ac = a.children
     bc = b.children
     while ac != None or bc != None:
@@ -83,7 +83,7 @@ class EventTemplate:
         if not xml_elements_equal(self.xml.getRootElement(),node):
             return False
         return True
-            
+
     def __repr__(self):
         return "<EventTemplate %r at %r: %r>" % (self.event, self.offset, self.xml.getRootElement().serialize())
 
@@ -125,22 +125,22 @@ class TestStreamReader(unittest.TestCase):
         del self.handler
         del self.reader
         self.whole_stream.freeDoc()
-        
+
     def test_1(self):
         self.do_test(1)
-        
+
     def test_2(self):
         self.do_test(2)
-        
+
     def test_10(self):
         self.do_test(10)
-        
+
     def test_100(self):
         self.do_test(100)
-        
+
     def test_1000(self):
         self.do_test(1000)
-        
+
     def do_test(self, chunk_length):
         while 1:
             data=self.file.read(chunk_length)
@@ -164,13 +164,13 @@ class TestStreamReader(unittest.TestCase):
         expected = self.expected_events.pop(0)
         self.failUnless(event==expected.event, "Got %r, expected %r" % (event, expected.event))
         if expected.offset < self.chunk_start:
-            self.fail("Delayed event: %r. Expected at: %i, found at %i:%i" 
+            self.fail("Delayed event: %r. Expected at: %i, found at %i:%i"
                     % (event, expected.offset, self.chunk_start, self.chunk_end))
         if expected.offset > self.chunk_end:
-            self.fail("Early event: %r. Expected at: %i, found at %i:%i" 
+            self.fail("Early event: %r. Expected at: %i, found at %i:%i"
                     % (event, expected.offset, self.chunk_start, self.chunk_end))
         if not expected.match(event,node):
-            self.fail("Unmatched event. Expected: %r, got: %r;%r" 
+            self.fail("Unmatched event. Expected: %r, got: %r;%r"
                     % (expected, event, node.serialize()))
         if event == "start":
             n = node.docCopyNode(self.whole_stream,1)
@@ -180,7 +180,7 @@ class TestStreamReader(unittest.TestCase):
             n = node.docCopyNode(self.whole_stream,1)
             r = self.whole_stream.getRootElement()
             r.addChild(n)
-            
+
 def suite():
     load_expected_events()
     load_whole_stream()
@@ -191,4 +191,4 @@ def suite():
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())
 
-# vi: sts=4 et sw=4 encoding=utf-8
+# vi: sts=4 et sw=4
diff --git a/tests/vcard.py b/tests/vcard.py
index a3a82e7..1410b53 100644
--- a/tests/vcard.py
+++ b/tests/vcard.py
@@ -4,7 +4,7 @@ import unittest
 
 import libxml2
 from pyxmpp.jabber import vcard
-    
+
 def vcard2txt(vcard):
     """Extract data from VCard object for text comparision.
     Separate function defined here to test the API (attribute access)."""
@@ -103,7 +103,7 @@ def vcard2txt(vcard):
 
 def xml_error_handler(ctx,error):
     pass
-    
+
 class TestVCard(unittest.TestCase):
     def setUp(self):
         libxml2.registerErrorHandler(xml_error_handler,None)