Combine logic for printing lists, generators, and sets (google#9)

r0fls · dbieber · commit f8ad6b7f78ef · 2017-03-06T07:20:16.000-08:00
* cleanup logic in print

* leave tuple logic separate
diff --git a/fire/core.py b/fire/core.py
@@ -57,6 +57,7 @@ def main(argv):
 import pipes
 import shlex
 import sys
+import types
 
 from fire import completion
 from fire import decorators
@@ -166,13 +167,8 @@ def _PrintResult(component_trace, verbose=False):
   # and move serialization to it's own module.
   result = component_trace.GetResult()
 
-  if isinstance(result, list):
-    for i in result:
-      print(_OneLineResult(i))
-  elif isinstance(result, set):
-    for i in result:
-      print(_OneLineResult(i))
-  elif inspect.isgenerator(result):
+
+  if isinstance(result, (list, set, types.GeneratorType)):
     for i in result:
       print(_OneLineResult(i))
   elif inspect.isgeneratorfunction(result):
