openstack/deb-python-wsme
Code Issues Proposed changes

Fix Unset values validation

Browse Source
This commit is contained in:
Christophe de Vienne
2011-11-07 12:32:55 +01:00
parent 03dd583c8d
commit c180ddfd6a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wsme/types.py
View File

@@ -95,6 +95,8 @@ def validate_value(datatype, value):
if hasattr(datatype, 'validate'): if hasattr(datatype, 'validate'):
return datatype.validate(value) return datatype.validate(value)
else: else:
if value is Unset:
return True
if value is not None: if value is not None:
if isarray(datatype): if isarray(datatype):
if not isinstance(value, list): if not isinstance(value, list):
@@ -163,11 +165,14 @@ class wsattr(object):
def __set__(self, instance, value): def __set__(self, instance, value):
validate_value(self.datatype, value) validate_value(self.datatype, value)
setattr(instance, '_' + self.key, value) if value is Unset:
if hasattr(instance, '_' + self.key):
delattr(instance, '_' + self.key)
else:
setattr(instance, '_' + self.key, value)
def __delete__(self, instance): def __delete__(self, instance):
delattr(instance, '_' + self.key) self.__set__(instance, Unset)
def iswsattr(attr): def iswsattr(attr):
if inspect.isfunction(attr) or inspect.ismethod(attr): if inspect.isfunction(attr) or inspect.ismethod(attr):