Allow simple Python objects to be used as argument to jsonize()

weewx · Nov 18, 2024 · 1566a76 · 1566a76
1 parent 8e3128c
commit 1566a76
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/docs_src/changes.md b/docs_src/changes.md
@@ -8,6 +8,8 @@ stations.
 
 Fix bug that prevented relative paths to the config file from working.
 
+Allow simple Python objects to be used as an argument to `$jsonize()`.
+
 
 ### 5.1.0 07/04/2024
 

diff --git a/src/weewx/cheetahgenerator.py b/src/weewx/cheetahgenerator.py
@@ -643,13 +643,16 @@ def jsonize(arg):
         Format my argument as JSON
 
         Args:
-            arg (iterable): An iterable, such as a list, or zip structure
+            arg (iterable|object): Python object, or an iterable
 
         Returns:
             str: The argument formatted as JSON.
         """
-        val = list(arg)
-        return json.dumps(val, cls=weewx.units.ComplexEncoder)
+        try:
+            result = json.dumps(arg, cls=weewx.units.ComplexEncoder)
+        except TypeError:
+            result = json.dumps(list(arg), cls=weewx.units.ComplexEncoder)
+        return result
 
     @staticmethod
     def rnd(arg, ndigits):

diff --git a/src/weewx/tests/test_cheetah.py b/src/weewx/tests/test_cheetah.py
@@ -82,6 +82,10 @@ def test_jsonize(self):
                          '[[0, 1], [null, 3], [4, 5]]')
         self.assertEqual(weewx.cheetahgenerator.JSONHelpers.jsonize([complex(1,2), complex(3,4)]),
                          '[[1.0, 2.0], [3.0, 4.0]]')
+        self.assertEqual(weewx.cheetahgenerator.JSONHelpers.jsonize([1,2,3]),
+                         '[1, 2, 3]')
+        self.assertEqual(weewx.cheetahgenerator.JSONHelpers.jsonize({'a': 1, 'b': 2}),
+                         '{"a": 1, "b": 2}')
 
     def test_rnd(self):
         self.assertEqual(weewx.cheetahgenerator.JSONHelpers.rnd(1.2345, 2), 1.23)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,8 @@ stations.

		Fix bug that prevented relative paths to the config file from working.

		Allow simple Python objects to be used as an argument to `$jsonize()`.


		### 5.1.0 07/04/2024

Expand Down