Merge branch 'orjson_encoding' into orjson_encoding_instrumentation

Author: jonmmease

Diff for: packages/python/plotly/plotly/io/_json.py

@@ -540,13 +540,13 @@ def clean_to_json_compatible(obj, **kwargs):
         # to string since engine can do that
         obj = obj.replace(tzinfo=None)
         obj = obj.to_pydatetime()
-    except(TypeError, AttributeError):
+    except (TypeError, AttributeError):
         pass
 
     if not datetime_allowed:
         try:
             return obj.isoformat()
-        except(TypeError, AttributeError):
+        except (TypeError, AttributeError):
             pass
     elif isinstance(obj, datetime.datetime):
         return obj

Diff for: packages/python/plotly/plotly/tests/test_optional/test_offline/test_offline.py

@@ -10,6 +10,7 @@
 import pytest
 
 import plotly
+import plotly.io as pio
 from plotly import optional_imports
 
 matplotlylib = optional_imports.get_module("plotly.matplotlylib")
@@ -76,12 +77,8 @@ def test_default_mpl_plot_generates_expected_html(self):
             data = figure["data"]
 
             layout = figure["layout"]
-            data_json = _json.dumps(
-                data, cls=plotly.utils.PlotlyJSONEncoder, sort_keys=True
-            )
-            layout_json = _json.dumps(
-                layout, cls=plotly.utils.PlotlyJSONEncoder, sort_keys=True
-            )
+            data_json = pio.json.to_json_plotly(data)
+            layout_json = pio.json.to_json_plotly(layout)
             html = self._read_html(plotly.offline.plot_mpl(fig))
 
             # blank out uid before comparisons