From 8e434ed6574a5b391d9b57f3cbb10f73e62a403c Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 5 May 2006 17:48:01 -0400 Subject: Interim commit --- cobbler/serializer.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'cobbler/serializer.py') diff --git a/cobbler/serializer.py b/cobbler/serializer.py index 847be6e..112025e 100644 --- a/cobbler/serializer.py +++ b/cobbler/serializer.py @@ -1,9 +1,13 @@ # Michael DeHaan import api -import util +import utils +import syck # PySyck 0.61 or greater, not syck-python 0.55 +import msg def serialize(obj): + if obj.filename() is None: + raise Exception("not serializable") fd = open(obj.filename(),"w+") datastruct = obj.to_datastruct() yaml = syck.dump(datastruct) @@ -12,8 +16,15 @@ def serialize(obj): return True def deserialize(obj): - fd = open(obj.filename(),"r") + if obj.filename() is None: + raise Exception("not serializable") + try: + fd = open(obj.filename(),"r") + except: + print msg.m("parse_error") % obj.filename() + return data = fd.read() datastruct = yaml.load(data) fd.close() - return obj.from_datastruct(datastruct) + obj.from_datastruct(datastruct) + return True -- cgit