Ignore:
Timestamp:
04/16/06 19:45:21 (7 years ago)
Author:
xi
Message:

Refactor resolver.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pyyaml/trunk/lib/yaml/loader.py

    r136 r137  
    77from composer import * 
    88from constructor import * 
    9 from detector import * 
     9from resolver import * 
    1010 
    11 class BaseLoader(Reader, Scanner, Parser, 
    12         BaseComposer, BaseConstructor, BaseDetector): 
     11class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver): 
    1312 
    1413    def __init__(self, stream): 
    … …  
    1615        Scanner.__init__(self) 
    1716        Parser.__init__(self) 
    18         BaseComposer.__init__(self) 
     17        Composer.__init__(self) 
    1918        BaseConstructor.__init__(self) 
    20         BaseDetector.__init__(self) 
     19        BaseResolver.__init__(self) 
    2120 
    22 class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Detector): 
     21class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): 
    2322 
    2423    def __init__(self, stream): 
    … …  
    2827        Composer.__init__(self) 
    2928        SafeConstructor.__init__(self) 
    30         Detector.__init__(self) 
     29        Resolver.__init__(self) 
    3130 
    32 class Loader(Reader, Scanner, Parser, Composer, Constructor, Detector): 
     31class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver): 
    3332 
    3433    def __init__(self, stream): 
    … …  
    3837        Composer.__init__(self) 
    3938        Constructor.__init__(self) 
    40         Detector.__init__(self) 
     39        Resolver.__init__(self) 
    4140 
Note: See TracChangeset for help on using the changeset viewer.