Changeset 136 for pyyaml/trunk/tests/test_canonical.py

Timestamp:

04/15/06 19:54:52 (7 years ago)

Author:

xi

Message:

Major refactoring.

File:

• pyyaml/trunk/tests/test_canonical.py (modified) (2 diffs)

pyyaml/trunk/tests/test_canonical.py

@@ -6 +6 @@
     def _testCanonicalScanner(self, test_name, canonical_filename):
         data = file(canonical_filename, 'rb').read()
-        scanner = test_appliance.CanonicalScanner(data)
-        tokens = scanner.scan()
+        tokens = list(test_appliance.canonical_scan(data))
         #for token in tokens:
         #    print token
@@ -13 +12 @@
     def _testCanonicalParser(self, test_name, canonical_filename):
         data = file(canonical_filename, 'rb').read()
-        parser = test_appliance.CanonicalParser(data)
-        events = parser.parse()
+        event = list(test_appliance.canonical_parse(data))
         #for event in events:
         #    print event