|
|
@@ -78,15 +78,8 @@ class SchemaToForm:
|
|
|
if is_int(dest_key[-1]):
|
|
|
*parent_key, idx = dest_key
|
|
|
|
|
|
- try:
|
|
|
- dest_field = rgetattr(self.form, tuple(parent_key))
|
|
|
- dest_field.entries[idx].data = value
|
|
|
- except AttributeError:
|
|
|
- dest_field = getattr(
|
|
|
- rgetattr(self.form, tuple(parent_key[:-1])).entries[idx],
|
|
|
- parent_key[-1]
|
|
|
- )
|
|
|
- dest_field.data = value
|
|
|
+ dest_field = rgetattr(self.form, tuple(parent_key))
|
|
|
+ dest_field.entries[idx].data = value
|
|
|
|
|
|
else:
|
|
|
dest_field = self.get_field(self.form, dest_key)
|
|
|
@@ -100,20 +93,11 @@ class SchemaToForm:
|
|
|
|
|
|
def set_errors(self):
|
|
|
for k, error_list in nested_dict_iter(self.errors):
|
|
|
- try:
|
|
|
- field = self.get_field(self.form, k)
|
|
|
- if isinstance(field, FormField):
|
|
|
- setattr(field.form, '_errors', error_list)
|
|
|
- else:
|
|
|
- setattr(field, 'errors', error_list)
|
|
|
- except TypeError:
|
|
|
- try:
|
|
|
- *field_list, n = k
|
|
|
- rgetattr(self.form, tuple(field_list)).entries[n].errors = error_list
|
|
|
- except TypeError:
|
|
|
- *field_list, n, key = k
|
|
|
- getattr(rgetattr(self.form, tuple(field_list))[n], key).errors = error_list
|
|
|
-
|
|
|
+ field = self.get_field(self.form, k)
|
|
|
+ if isinstance(field, FormField):
|
|
|
+ setattr(field.form, '_errors', error_list)
|
|
|
+ else:
|
|
|
+ setattr(field, 'errors', error_list)
|
|
|
|
|
|
for k, error_list in nested_dict_iter(self.errors):
|
|
|
try:
|