Remove last references to old YAML parser.

Conflicts:

	CHANGELOG
	scripts/index.py

2 files changed, 4 insertions, 4 deletions

diff --git a/scripts/index.py b/scripts/index.py
index bf3b17c9..5acfe09e 100755
--- a/scripts/index.py
+++ b/scripts/index.py
@@ -21,7 +21,7 @@ import cgi
 import os
 from cobbler.webui import CobblerWeb
 import cobbler.utils as utils
-import cobbler.yaml as yaml
+import yaml # PyYAML
 
 XMLRPC_SERVER = "http://127.0.0.1:25151" # FIXME: pull port from settings
 
@@ -109,7 +109,7 @@ def handler(req):
     fd = open("/etc/cobbler/settings")
     data = fd.read()
     fd.close()
-    ydata = yaml.load(data).next()
+    ydata = yaml.load(data)
     remote_port = ydata.get("xmlrpc_port", 25151)
 
     mode = form.get('mode','index')
diff --git a/scripts/services.py b/scripts/services.py
index 051d5b65..36d00c01 100755
--- a/scripts/services.py
+++ b/scripts/services.py
@@ -20,7 +20,7 @@ import xmlrpclib
 import cgi
 import os
 from cobbler.services import CobblerSvc
-import cobbler.yaml as yaml
+import yaml # PyYAML version
 import cobbler.utils as utils
 
 #=======================================
@@ -72,7 +72,7 @@ def handler(req):
     fd = open("/etc/cobbler/settings")
     data = fd.read()
     fd.close()
-    ydata = yaml.load(data).next()
+    ydata = yaml.load(data)
     remote_port = ydata.get("xmlrpc_port",25151)
 
     # instantiate a CobblerWeb object