Index: trunk/tests/test_emitter.py
===================================================================
--- trunk/tests/test_emitter.py	(revision 23)
+++ trunk/tests/test_emitter.py	(revision 17)
@@ -163,16 +163,16 @@
         emitter = _syck.Emitter(StringIO.StringIO(), headless=False)
         emitter.emit(CYCLE)
-        self.assert_(emitter.output.getvalue().find('---') != -1)
+        self.assert_('---' in emitter.output.getvalue())
         emitter = _syck.Emitter(StringIO.StringIO(), headless=True)
         emitter.emit(CYCLE)
-        self.assert_(emitter.output.getvalue().find('---') == -1)
+        self.assert_('---' not in emitter.output.getvalue())
 
     def testUseHeader(self):
         emitter = _syck.Emitter(StringIO.StringIO(), headless=True)
         emitter.emit(EXAMPLE)
-        self.assert_(emitter.output.getvalue().find('---') == -1)
+        self.assert_('---' not in emitter.output.getvalue())
         emitter = _syck.Emitter(StringIO.StringIO(), use_header=True)
         emitter.emit(EXAMPLE)
-        self.assert_(emitter.output.getvalue().find('---') != -1)
+        self.assert_('---' in emitter.output.getvalue())
 
     def testExplicitTyping(self):
@@ -235,6 +235,5 @@
         document = parser.parse()
         self.assertEqual(len(document.value), len(TAGS))
-        for index in range(len(document.value)):
-            node = document.value[index]
+        for index, node in enumerate(document.value):
             self.assertEqual(node.tag, TAGS[index])
 
@@ -283,11 +282,11 @@
 
 
-#class TestSyckBugWithTrailingSpace(unittest.TestCase):
-#
-#    def testSyckBugWithTrailingSpace(self):
-#        emitter = _syck.Emitter(StringIO.StringIO())
-#        emitter.emit(_syck.Scalar('foo ', tag="tag:yaml.org,2002:str"))
-#        parser = _syck.Parser(emitter.output.getvalue())
-#        self.assertEqual(parser.parse().value, 'foo ')
-
-
+class TestSyckBugWithTrailingSpace(unittest.TestCase):
+
+    def testSyckBugWithTrailingSpace(self):
+        emitter = _syck.Emitter(StringIO.StringIO())
+        emitter.emit(_syck.Scalar('foo ', tag="tag:yaml.org,2002:str"))
+        parser = _syck.Parser(emitter.output.getvalue())
+        self.assertEqual(parser.parse().value, 'foo ')
+
+