From e67f56ae56ea3e796685f8f4ce22f03d88164d6c Mon Sep 17 00:00:00 2001 From: Wyllys Ingersoll Date: Fri, 12 Sep 2014 12:55:18 -0400 Subject: [PATCH] Added TypeError exception to Name.create method --- kmip/core/attributes.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kmip/core/attributes.py b/kmip/core/attributes.py index 08bad52..259910a 100644 --- a/kmip/core/attributes.py +++ b/kmip/core/attributes.py @@ -108,13 +108,25 @@ class Name(Struct): value = name_value elif isinstance(name_value, str): value = cls.NameValue(name_value) - # else: the __validate function will throw TypeError + else: + name = self.__class__.__name__ + msg = ErrorStrings.BAD_EXP_RECV + member = 'name_value' + raise TypeError(msg.format('{}.{}'.format(name, member), + 'name_value', type(Name.NameValue), + type(self.name_value))) if isinstance(name_type, Name.NameType): n_type = name_type elif isinstance(name_type, Enum): n_type = cls.NameType(name_type) - # else: the __validate function will throw TypeError + else: + name = self.__class__.__name__ + msg = ErrorStrings.BAD_EXP_RECV + member = 'name_type' + raise TypeError(msg.format('{}.{}'.format(name, member), + 'name_type', type(Name.NameType), + type(self.name_type))) return Name(name_value=value, name_type=n_type)