Skip to content

S
s1zlibs
Commit ef0386c2 by Oleksandr Barabash
Options

hotfixes

parent 5774ab67
Showing with 16 additions and 30 deletions
build/lib/s1zlibs/jsoner/serializers/simple_serializer.py
...@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer): ...@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer):
)) ))
@staticmethod @staticmethod
def raise_value_error(value, type_required): def raise_value_error(value, types_list):
raise AttributeError("Could not handle value: {}. required: {}".format( raise AttributeError(("No supported type detected: {}. "
value.__name__, type_required.__name__ "Required one of these: '{}'").format(
)) value.__class__.__name__,
', '.join([x.__name__ for x in types_list])))
def get_value_type(self, value_type): def get_value_type(self, value_type):
# If the value type is an array # If the value type is an array
...@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer): ...@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer):
dumped = list() dumped = list()
for raw_data in values: for raw_data in values:
if not isinstance(raw_data, self.value_type): 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) dumped.append(raw_data)
return dumped return dumped
...@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer): ...@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
raise AttributeError(("No supported type detected: {}. " self.raise_value_error(value, [self.value_type])
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
def dumps(self, value): def dumps(self, value):
if not self.value_is_list and not isinstance(value, list): if not self.value_is_list and not isinstance(value, list):
...@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer): ...@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
raise AttributeError(("No supported type detected: {}. " self.raise_value_error(value, [self.value_type])
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
s1zlibs/jsoner/serializers/simple_serializer.py
...@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer): ...@@ -19,10 +19,11 @@ class SimpleSerializer(BaseSerializer):
)) ))
@staticmethod @staticmethod
def raise_value_error(value, type_required): def raise_value_error(value, types_list):
raise AttributeError("Could not handle value: {}. required: {}".format( raise AttributeError(("No supported type detected: {}. "
value.__name__, type_required.__name__ "Required one of these: '{}'").format(
)) value.__class__.__name__,
', '.join([x.__name__ for x in types_list])))
def get_value_type(self, value_type): def get_value_type(self, value_type):
# If the value type is an array # If the value type is an array
...@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer): ...@@ -43,7 +44,7 @@ class SimpleSerializer(BaseSerializer):
dumped = list() dumped = list()
for raw_data in values: for raw_data in values:
if not isinstance(raw_data, self.value_type): 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) dumped.append(raw_data)
return dumped return dumped
...@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer): ...@@ -55,11 +56,7 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
raise AttributeError(("No supported type detected: {}. " self.raise_value_error(value, [self.value_type])
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
def dumps(self, value): def dumps(self, value):
if not self.value_is_list and not isinstance(value, list): if not self.value_is_list and not isinstance(value, list):
...@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer): ...@@ -69,8 +66,4 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
raise AttributeError(("No supported type detected: {}. " self.raise_value_error(value, [self.value_type])
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
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