Refactor resolver.
diff --git a/lib/yaml/loader.py b/lib/yaml/loader.py
index f8d8673..293ff46 100644
--- a/lib/yaml/loader.py
+++ b/lib/yaml/loader.py
@@ -6,20 +6,19 @@
from parser import *
from composer import *
from constructor import *
-from detector import *
+from resolver import *
-class BaseLoader(Reader, Scanner, Parser,
- BaseComposer, BaseConstructor, BaseDetector):
+class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver):
def __init__(self, stream):
Reader.__init__(self, stream)
Scanner.__init__(self)
Parser.__init__(self)
- BaseComposer.__init__(self)
+ Composer.__init__(self)
BaseConstructor.__init__(self)
- BaseDetector.__init__(self)
+ BaseResolver.__init__(self)
-class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Detector):
+class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver):
def __init__(self, stream):
Reader.__init__(self, stream)
@@ -27,9 +26,9 @@
Parser.__init__(self)
Composer.__init__(self)
SafeConstructor.__init__(self)
- Detector.__init__(self)
+ Resolver.__init__(self)
-class Loader(Reader, Scanner, Parser, Composer, Constructor, Detector):
+class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver):
def __init__(self, stream):
Reader.__init__(self, stream)
@@ -37,5 +36,5 @@
Parser.__init__(self)
Composer.__init__(self)
Constructor.__init__(self)
- Detector.__init__(self)
+ Resolver.__init__(self)
