Changeset 46 for branches/pyyaml3000/tests/test_structure.py

Timestamp:

02/16/06 17:22:59 (7 years ago)

Author:

xi

Message:

Some renaming.

File:

• branches/pyyaml3000/tests/test_structure.py (modified) (3 diffs)

branches/pyyaml3000/tests/test_structure.py

@@ -2 +2 @@
 import test_appliance
 
+from yaml.reader import Reader
+from yaml.scanner import Scanner
 from yaml.parser import *
 
@@ -10 +12 @@
         node2 = eval(file(structure_filename, 'rb').read())
         try:
-            parser = Parser(data_filename, file(data_filename, 'rb').read())
+            parser = Parser(Scanner(Reader(file(data_filename, 'rb'))))
             node1 = parser.parse()
             node1 = [self._convert(n) for n in node1]
@@ -50 +52 @@
         documents2 = None
         try:
-            parser = Parser(data_filename, file(data_filename, 'rb').read())
+            parser = Parser(Scanner(Reader(file(data_filename, 'rb'))))
             documents1 = parser.parse()
             canonical = test_appliance.CanonicalParser(canonical_filename, file(canonical_filename, 'rb').read())