Fixed Issue 42: Handled another type of exception and added testcase … (

#49) Fixes issue #42, falling back to str when json fails to handle circular references
google · Apr 7, 2017 · a0791c9 · a0791c9
1 parent f48f93b
commit a0791c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/fire/core.py b/fire/core.py
@@ -247,7 +247,7 @@ def _OneLineResult(result):
 
   try:
     return json.dumps(result)
-  except TypeError:
+  except (TypeError, ValueError):
     return str(result).replace('\n', ' ')
 
 

diff --git a/fire/core_test.py b/fire/core_test.py
@@ -33,6 +33,12 @@ def testOneLineResult(self):
     self.assertEqual(core._OneLineResult({}), '{}')  # pylint: disable=protected-access
     self.assertEqual(core._OneLineResult({'x': 'y'}), '{"x": "y"}')  # pylint: disable=protected-access
 
+
+  def testOneLineResultCircularRef(self):
+    circular_reference = tc.CircularReference()
+    self.assertEqual(core._OneLineResult(circular_reference.create()),  # pylint: disable=protected-access
+                     "{'y': {...}}")
+
   @mock.patch('fire.interact.Embed')
   def testInteractiveMode(self, mock_embed):
     core.Fire(tc.TypedProperties, 'alpha')

diff --git a/fire/test_components.py b/fire/test_components.py
@@ -206,3 +206,11 @@ def totally_empty(self):
 
   def nothing_printable(self):
     return {'__do_not_print_me': 1}
+
+
+class CircularReference(object):
+
+  def create(self):
+    x = {}
+    x['y'] = x
+    return x