Index: pyyaml/trunk/tests/test_canonical.py
===================================================================
--- pyyaml/trunk/tests/test_canonical.py	(revision 51)
+++ pyyaml/trunk/tests/test_canonical.py	(revision 136)
@@ -6,6 +6,5 @@
     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,6 +12,5 @@
     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