Earlier cobbler runs were tainted from an RHN yaml install. These modifications to the yaml tree

allow for relative import and do not break cobbler when yaml isn't installed.

3 files changed, 7 insertions, 5 deletions

diff --git a/cobbler/yaml/dump.py b/cobbler/yaml/dump.py
index ef70216..c55dbfe 100644
--- a/cobbler/yaml/dump.py
+++ b/cobbler/yaml/dump.py
@@ -2,7 +2,7 @@ import types
 import string

 from types import StringType, UnicodeType, IntType, FloatType

 from types import DictType, ListType, TupleType, InstanceType

-from yaml.klass import hasMethod, isDictionary

+from klass import hasMethod, isDictionary

 import re

 

 """

diff --git a/cobbler/yaml/load.py b/cobbler/yaml/load.py
index 8c5f5b6..259178d 100644
--- a/cobbler/yaml/load.py
+++ b/cobbler/yaml/load.py
@@ -1,8 +1,8 @@
 import re, string

 from implicit import convertImplicit

 from inline import InlineTokenizer

-from yaml.klass import DefaultResolver

-from yaml.stream import YamlLoaderException, FileStream, StringStream, NestedDocs

+from klass import DefaultResolver

+from stream import YamlLoaderException, FileStream, StringStream, NestedDocs

 

 try:

     iter(list()) # is iter supported by this version of Python?

diff --git a/cobbler/yaml/redump.py b/cobbler/yaml/redump.py
index 418e5d3..56ea958 100644
--- a/cobbler/yaml/redump.py
+++ b/cobbler/yaml/redump.py
@@ -1,5 +1,7 @@
-from yaml.ordered_dict import OrderedDict
-from yaml import Parser, Dumper, StringStream
+from ordered_dict import OrderedDict
+from load import Parser
+from dump import Dumper
+from stream import StringStream
 
 def loadOrdered(stream):
     parser = Parser(StringStream(stream))