Ignore:
Timestamp:
04/15/06 19:54:52 (9 years ago)
Author:
xi
Message:

Major refactoring.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pyyaml/trunk/tests/test_detector.py

    r55 r136  
    22import test_appliance 
    33 
    4 from yaml.reader import Reader 
    5 from yaml.scanner import Scanner 
    6 from yaml.parser import * 
    7 from yaml.composer import * 
    8 from yaml.resolver import * 
    9 from yaml.nodes import * 
     4from yaml import * 
    105 
    116class TestDetector(test_appliance.TestAppliance): 
     
    1611        try: 
    1712            correct_tag = file(detect_filename, 'rb').read().strip() 
    18             resolver = Resolver(Composer(Parser(Scanner(Reader(file(data_filename, 'rb')))))) 
    19             node = list(iter(resolver))[0] 
     13            node = compose(file(data_filename, 'rb')) 
    2014            self.failUnless(isinstance(node, SequenceNode)) 
    2115            for scalar in node.value: 
     
    3428TestDetector.add_tests('testDetector', '.data', '.detect') 
    3529 
    36  
Note: See TracChangeset for help on using the changeset viewer.