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

Timestamp:

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

Author:

xi

Message:

Major refactoring.

File:

• pyyaml/trunk/tests/test_detector.py (modified) (3 diffs)

pyyaml/trunk/tests/test_detector.py

@@ -2 +2 @@
 import test_appliance
 
-from yaml.reader import Reader
-from yaml.scanner import Scanner
-from yaml.parser import *
-from yaml.composer import *
-from yaml.resolver import *
-from yaml.nodes import *
+from yaml import *
 
 class TestDetector(test_appliance.TestAppliance):
@@ -16 +11 @@
         try:
             correct_tag = file(detect_filename, 'rb').read().strip()
-            resolver = Resolver(Composer(Parser(Scanner(Reader(file(data_filename, 'rb'))))))
-            node = list(iter(resolver))[0]
+            node = compose(file(data_filename, 'rb'))
             self.failUnless(isinstance(node, SequenceNode))
             for scalar in node.value:
@@ -34 +28 @@
 TestDetector.add_tests('testDetector', '.data', '.detect')
 
-