Skip to content

Commit 8acd211

Browse files
authored
Merge pull request #2877 from marshmallow-code/3.x-delint
3.x delint
2 parents 2c4451e + b4bcb4a commit 8acd211

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/marshmallow/error_store.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ def store_error(self, messages, field_name=SCHEMA, index=None):
2525
messages = {index: messages}
2626
self.errors = merge_errors(self.errors, messages)
2727

28+
2829
def copy_containers(errors):
2930
if isinstance(errors, list):
3031
return [copy_containers(val) for val in errors]
3132
if isinstance(errors, dict):
3233
return {key: copy_containers(val) for key, val in errors.items()}
3334
return errors
3435

36+
3537
def merge_errors(errors1, errors2): # noqa: PLR0911
3638
"""Deeply merge two error messages.
3739

tests/test_error_store.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import NamedTuple
22

33
from marshmallow import missing
4-
from marshmallow.error_store import merge_errors, ErrorStore
4+
from marshmallow.error_store import ErrorStore, merge_errors
55

66

77
def test_missing_is_falsy():

0 commit comments

Comments
 (0)