Index: branches/pyyaml3000/tests/test_canonical.py
===================================================================
--- branches/pyyaml3000/tests/test_canonical.py	(revision 43)
+++ branches/pyyaml3000/tests/test_canonical.py	(revision 51)
@@ -6,14 +6,15 @@
     def _testCanonicalScanner(self, test_name, canonical_filename):
         data = file(canonical_filename, 'rb').read()
-        scanner = test_appliance.CanonicalScanner(canonical_filename, data)
+        scanner = test_appliance.CanonicalScanner(data)
         tokens = scanner.scan()
-        #print tokens
+        #for token in tokens:
+        #    print token
 
     def _testCanonicalParser(self, test_name, canonical_filename):
         data = file(canonical_filename, 'rb').read()
-        parser = test_appliance.CanonicalParser(canonical_filename, data)
-        documents = parser.parse()
-        #for document in documents:
-        #    print document
+        parser = test_appliance.CanonicalParser(data)
+        events = parser.parse()
+        #for event in events:
+        #    print event
 
 TestCanonicalAppliance.add_tests('testCanonicalScanner', '.canonical')