Merge branch 'codespell-update' into 'v3'
Fix spellings found as codespell updates See merge request openflexure/openflexure-microscope-server!526
This commit is contained in:
commit
ba8de65fd2
2 changed files with 2 additions and 2 deletions
|
|
@ -291,7 +291,7 @@ def merge_patch(
|
||||||
|
|
||||||
:param target: The target object
|
:param target: The target object
|
||||||
:param patch: The patch to be applied
|
:param patch: The patch to be applied
|
||||||
:param enforce_dict: Boolean, set True enfoces that the target and patch are both
|
:param enforce_dict: Boolean, set True enforces that the target and patch are both
|
||||||
dictionaries.
|
dictionaries.
|
||||||
"""
|
"""
|
||||||
if enforce_dict and not (isinstance(target, dict) and isinstance(patch, dict)):
|
if enforce_dict and not (isinstance(target, dict) and isinstance(patch, dict)):
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ from openflexure_microscope_server import utilities
|
||||||
def test_merge_patch(target, patch, outcome, err_if_enforce):
|
def test_merge_patch(target, patch, outcome, err_if_enforce):
|
||||||
"""Check that merge_patch returns the expected outcome for each target and patch.
|
"""Check that merge_patch returns the expected outcome for each target and patch.
|
||||||
|
|
||||||
These test cases are specified in Appedix A of IETF RFC 7396.
|
These test cases are specified in Appendix A of IETF RFC 7396.
|
||||||
"""
|
"""
|
||||||
assert utilities.merge_patch(target, patch) == outcome
|
assert utilities.merge_patch(target, patch) == outcome
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue