Commit ef0386c2 by Oleksandr Barabash

hotfixes

parent 5774ab67
......@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer):
))
@staticmethod
def raise_value_error(value, type_required):
raise AttributeError("Could not handle value: {}. required: {}".format(
value.__name__, type_required.__name__
))
def raise_value_error(value, types_list):
raise AttributeError(("No supported type detected: {}. "
"Required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in types_list])))
def get_value_type(self, value_type):
# If the value type is an array
......@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer):
dumped = list()
for raw_data in values:
if not isinstance(raw_data, self.value_type):
self.raise_value_error(raw_data, self.value_type)
self.raise_value_error(raw_data, [self.value_type])
dumped.append(raw_data)
return dumped
......@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list):
return self.check_type(value)
raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
self.raise_value_error(value, [self.value_type])
def dumps(self, value):
if not self.value_is_list and not isinstance(value, list):
......@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list):
return self.check_type(value)
raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
self.raise_value_error(value, [self.value_type])
......@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer):
))
@staticmethod
def raise_value_error(value, type_required):
raise AttributeError("Could not handle value: {}. required: {}".format(
value.__name__, type_required.__name__
))
def raise_value_error(value, types_list):
raise AttributeError(("No supported type detected: {}. "
"Required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in types_list])))
def get_value_type(self, value_type):
# If the value type is an array
......@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer):
dumped = list()
for raw_data in values:
if not isinstance(raw_data, self.value_type):
self.raise_value_error(raw_data, self.value_type)
self.raise_value_error(raw_data, [self.value_type])
dumped.append(raw_data)
return dumped
......@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list):
return self.check_type(value)
raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
self.raise_value_error(value, [self.value_type])
def dumps(self, value):
if not self.value_is_list and not isinstance(value, list):
......@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list):
return self.check_type(value)
raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
self.raise_value_error(value, [self.value_type])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment