Merge pull request #638 from Andrew-S-Rosen/patch-1

monty/itertools.py

@@ -1,6 +1,7 @@
 """
 Additional tools for iteration.
 """
+
 import itertools
 
 try:

monty/json.py

@@ -713,8 +713,11 @@ def jsanitize(
  except TypeError:
  pass
 
- if recursive_msonable and isinstance(obj, MSONable):
- return obj.as_dict()
+ if recursive_msonable:
+ try:
+ return obj.as_dict()
+ except AttributeError:
+ pass
 
  if not strict:
  return str(obj)

monty/operator.py

@@ -1,6 +1,7 @@
 """
 Useful additional functions for operators
 """
+
 import operator
 
 

monty/os/path.py

@@ -1,6 +1,7 @@
 """
 Path based methods, e.g., which, zpath, etc.
 """
+
 import os
 
 from monty.fnmatch import WildCard

monty/serialization.py

@@ -2,6 +2,7 @@
 This module implements serialization support for common formats such as json
 and yaml.
 """
+
 import json
 import os
 

monty/shutil.py

@@ -1,4 +1,5 @@
 """Copying and zipping utilities. Works on directories mostly."""
+
 from __future__ import annotations
 
 import os

monty/subprocess.py

@@ -1,6 +1,7 @@
 """
 Calling shell processes.
 """
+
 import shlex
 import threading
 import traceback

monty/termcolor.py

@@ -20,6 +20,7 @@
 
 ANSII Color formatting for output in terminal.
 """
+
 import os
 
 try:

tasks.py

@@ -4,7 +4,6 @@
 Deployment file to facilitate releases of monty.
 """
 
-
 import datetime
 import glob
 import json

tests/test_json.py

@@ -600,17 +600,19 @@ def test_jsanitize(self):
  assert clean["world"] is None
  assert json.loads(json.dumps(d)) == json.loads(json.dumps(clean))
 
- d = {"hello": GoodMSONClass(1, 2, 3)}
+ d = {"hello": GoodMSONClass(1, 2, 3), "test": "hi"}
  with pytest.raises(TypeError):
  json.dumps(d)
  clean = jsanitize(d)
  assert isinstance(clean["hello"], str)
  clean_strict = jsanitize(d, strict=True)
  assert clean_strict["hello"]["a"] == 1
  assert clean_strict["hello"]["b"] == 2
+ assert clean_strict["test"] == "hi"
  clean_recursive_msonable = jsanitize(d, recursive_msonable=True)
  assert clean_recursive_msonable["hello"]["a"] == 1
  assert clean_recursive_msonable["hello"]["b"] == 2
+ assert clean_recursive_msonable["test"] == "hi"
 
  d = {"dt": datetime.datetime.now()}
  clean = jsanitize(d)