Changeset 23

Timestamp:

08/14/05 05:39:31 (8 years ago)

Author:

xi

Message:

Fix obvious compatibility issues.

Location:

trunk

Files:

• lib/syck/dumpers.py (modified) (1 diff)
• tests/test_dumper.py (modified) (2 diffs)
• tests/test_emitter.py (modified) (2 diffs)
• tests/test_loader.py (modified) (2 diffs)
• tests/test_parser.py (modified) (1 diff)

trunk/lib/syck/dumpers.py

@@ -26 +26 @@
         object_to_node[id(object)] = object, node
         if node.kind == 'seq':
-            for index, item in enumerate(node.value):
+            for index in range(len(node.value)):
+                item = node.value[index]
                 node.value[index] = self._convert(item, object_to_node)
         elif node.kind == 'map':

trunk/tests/test_dumper.py

@@ +1 @@
+
+from __future__ import generators
 
 import unittest
 import syck
-import StringIO, datetime, sets
+import StringIO
 import test_emitter
+
+try:
+    import datetime
+except:
+    class _datetime:
+        def datetime(self, *args):
+            return args
+    datetime = _datetime()
+
+try:
+    import sets
+except:
+    class _sets:
+        def Set(self, items):
+            set = {}
+            for items in items:
+                set[items] = None
+            return set
+    sets = _sets()
+
 
 EXAMPLE = {
@@ -136 +158 @@
         for a, b in zip(scalars, SCALARS):
             self.assertEqual(type(a), type(b))
-            self.assertEqual(a, b)
+            if type(a) is float:
+                self.assertEqual(repr(a), repr(b))
+            else:
+                self.assertEqual(a, b)
 
 class TestCollectionTypes(unittest.TestCase):

trunk/tests/test_emitter.py

@@ -163 +163 @@
         emitter = _syck.Emitter(StringIO.StringIO(), headless=False)
         emitter.emit(CYCLE)
-        self.assert_('---' in emitter.output.getvalue())
+        self.assert_(emitter.output.getvalue().find('---') != -1)
         emitter = _syck.Emitter(StringIO.StringIO(), headless=True)
         emitter.emit(CYCLE)
-        self.assert_('---' not in emitter.output.getvalue())
+        self.assert_(emitter.output.getvalue().find('---') == -1)
 
     def testUseHeader(self):
         emitter = _syck.Emitter(StringIO.StringIO(), headless=True)
         emitter.emit(EXAMPLE)
-        self.assert_('---' not in emitter.output.getvalue())
+        self.assert_(emitter.output.getvalue().find('---') == -1)
         emitter = _syck.Emitter(StringIO.StringIO(), use_header=True)
         emitter.emit(EXAMPLE)
-        self.assert_('---' in emitter.output.getvalue())
+        self.assert_(emitter.output.getvalue().find('---') != -1)
 
     def testExplicitTyping(self):
@@ -235 +235 @@
         document = parser.parse()
         self.assertEqual(len(document.value), len(TAGS))
-        for index, node in enumerate(document.value):
+        for index in range(len(document.value)):
+            node = document.value[index]
             self.assertEqual(node.tag, TAGS[index])
 

trunk/tests/test_loader.py

@@ -189 +189 @@
         tempfile.write(source)
         tempfile.seek(0)
-        try:
-            self.assertEqualStructure(syck.parse(tempfile), structure)
-            tempfile.seek(0)
-            self.assertEqual(syck.load(tempfile), structure)
-            tempfile.seek(0)
-        except:
-            os.remove(filename)
-            raise
+        self.assertEqualStructure(syck.parse(tempfile), structure)
+        tempfile.seek(0)
+        self.assertEqual(syck.load(tempfile), structure)
+        tempfile.seek(0)
 
 class TestImplicitScalars(unittest.TestCase):
@@ -210 +206 @@
 
     def testFloat(self):
-        self.assertAlmostEqual(syck.load('6.8523015e+5'), 685230.15)
+        self.assertEqual(syck.load('6.8523015e+5'), 685230.15)
         # Syck does not understand '_'.
         #self.assertAlmostEqual(syck.load('685.230_15e+03'), 685230.15)
         #self.assertAlmostEqual(syck.load('685_230.15'), 685230.15)
-        self.assertAlmostEqual(syck.load('685.23015e+03'), 685230.15)
-        self.assertAlmostEqual(syck.load('685230.15'), 685230.15)
-        self.assertAlmostEqual(syck.load('190:20:30.15'), 685230.15)
-        self.assertEqual(syck.load('-.inf'), -INF)
-        self.assertEqual(syck.load('.nan'), NAN)
+        self.assertEqual(syck.load('685.23015e+03'), 685230.15)
+        self.assertEqual(syck.load('685230.15'), 685230.15)
+        self.assertEqual(syck.load('190:20:30.15'), 685230.15)
+        self.assertEqual(repr(syck.load('-.inf')), repr(-INF))
+        self.assertEqual(repr(syck.load('.nan')), repr(NAN))
 
     def testInteger(self):

trunk/tests/test_parser.py

@@ -227 +227 @@
             self.assertEqual(type(structure), list)
             self.assertEqual(len(node.value), len(structure))
-            for i, item in enumerate(node.value):
+            for i in range(len(node.value)):
+                item = node.value[i]
                 self.assertEqualStructure(item, structure[i])
         elif node.kind == 'map':