From b500d132387b78444b5628c1e485372d476e77ca Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Fri, 12 Apr 2024 18:15:32 -0700 Subject: [PATCH 1/3] Add missing `recursive_msonable` kwargs to `jsanitize` inner functions In `jsanitize`, there are some recursive calls to `jsanitize` where all the user-supplied keyword arguments need to be retained for internal consistency. There were two instances missing `recursive_msonable=recursive_msonable` arguments that have now been added. --- monty/json.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monty/json.py b/monty/json.py index 726f3ec4..3b7e649e 100644 --- a/monty/json.py +++ b/monty/json.py @@ -849,13 +849,13 @@ def jsanitize( if isinstance(obj, (list, tuple)): return [ - jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values) + jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values, recursive_msonable=recursive_msonable) for i in obj ] if np is not None and isinstance(obj, np.ndarray): return [ - jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values) + jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values, recursive_msonable=recursive_msonable) for i in obj.tolist() ] From 586bdb80a57a941bc8558512061800080a49b115 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 01:15:59 +0000 Subject: [PATCH 2/3] pre-commit auto-fixes --- monty/json.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/monty/json.py b/monty/json.py index 3b7e649e..d7effb19 100644 --- a/monty/json.py +++ b/monty/json.py @@ -849,13 +849,25 @@ def jsanitize( if isinstance(obj, (list, tuple)): return [ - jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values, recursive_msonable=recursive_msonable) + jsanitize( + i, + strict=strict, + allow_bson=allow_bson, + enum_values=enum_values, + recursive_msonable=recursive_msonable, + ) for i in obj ] if np is not None and isinstance(obj, np.ndarray): return [ - jsanitize(i, strict=strict, allow_bson=allow_bson, enum_values=enum_values, recursive_msonable=recursive_msonable) + jsanitize( + i, + strict=strict, + allow_bson=allow_bson, + enum_values=enum_values, + recursive_msonable=recursive_msonable, + ) for i in obj.tolist() ] From 3610a8cdac6fb8f680325a9282a5b4c701828eed Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Fri, 12 Apr 2024 18:30:26 -0700 Subject: [PATCH 3/3] Update pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c15cb71f..113a72af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ authors = [ description = "Monty is the missing complement to Python." readme = "README.md" requires-python = ">=3.9" -keywords = ["usatt", "table tennis"] classifiers = [ "Programming Language :: Python :: 3", "Development Status :: 4 - Beta",