Index: pyyaml/trunk/tests/test_detector.py
===================================================================
--- pyyaml/trunk/tests/test_detector.py	(revision 55)
+++ pyyaml/trunk/tests/test_detector.py	(revision 136)
@@ -2,10 +2,5 @@
 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,6 +11,5 @@
         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,3 +28,2 @@
 TestDetector.add_tests('testDetector', '.data', '.detect')
 
-