moep/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplify object_id error handling

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-14 14:04:56 +02:00
commit fb705adc5d
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/cdist/core/object.py
View file

@ -34,13 +34,12 @@ DOT_CDIST = '.cdist'
class IllegalObjectIdError(cdist.Error): class IllegalObjectIdError(cdist.Error):
def __init__(self, object_id, type_name, message=None): def __init__(self, object_id, message=None):
self.object_id = object_id self.object_id = object_id
self.type_name = type_name
self.message = message or 'Illegal object id' self.message = message or 'Illegal object id'
def __str__(self): def __str__(self):
return '%s: type: %s, object_id: %s' % (self.message, self.type_name, self.object_id) return '%s: %s' % (self.message, self.object_id)
class Object(object): class Object(object):
@ -90,7 +89,7 @@ class Object(object):
def __init__(self, cdist_type, base_path, object_id=None): def __init__(self, cdist_type, base_path, object_id=None):
if object_id and object_id.startswith('/'): if object_id and object_id.startswith('/'):
raise IllegalObjectIdError(object_id, cdist_type.name, 'object_id may not start with /') raise IllegalObjectIdError(object_id, 'object_id may not start with /')
self.type = cdist_type # instance of Type self.type = cdist_type # instance of Type
self.base_path = base_path self.base_path = base_path
self.object_id = object_id self.object_id = object_id