Mercurial > libervia-backend

diff sat_frontends/jp/output_std.py @ 3640:f4c02bdb2d91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CLI: use global constants for output names
author Goffi <goffi@goffi.org>
date Wed, 08 Sep 2021 11:13:35 +0200
parents be6d91572633
children 4b842c1fb686
line wrap: on
line diff
--- a/sat_frontends/jp/output_std.py	Wed Sep 01 13:46:43 2021 +0200
+++ b/sat_frontends/jp/output_std.py	Wed Sep 08 11:13:35 2021 +0200
@@ -26,9 +26,6 @@
 import json
 
 __outputs__ = ["Simple", "Json"]
-SIMPLE = "simple"
-JSON = "json"
-JSON_RAW = "json_raw"
 
 
 class Simple(object):
@@ -36,13 +33,13 @@
 
     def __init__(self, host):
         self.host = host
-        host.register_output(C.OUTPUT_TEXT, SIMPLE, self.simple_print)
-        host.register_output(C.OUTPUT_LIST, SIMPLE, self.list)
-        host.register_output(C.OUTPUT_DICT, SIMPLE, self.dict)
-        host.register_output(C.OUTPUT_LIST_DICT, SIMPLE, self.list_dict)
-        host.register_output(C.OUTPUT_DICT_DICT, SIMPLE, self.dict_dict)
-        host.register_output(C.OUTPUT_MESS, SIMPLE, self.messages)
-        host.register_output(C.OUTPUT_COMPLEX, SIMPLE, self.simple_print)
+        host.register_output(C.OUTPUT_TEXT, C.OUTPUT_NAME_SIMPLE, self.simple_print)
+        host.register_output(C.OUTPUT_LIST, C.OUTPUT_NAME_SIMPLE, self.list)
+        host.register_output(C.OUTPUT_DICT, C.OUTPUT_NAME_SIMPLE, self.dict)
+        host.register_output(C.OUTPUT_LIST_DICT, C.OUTPUT_NAME_SIMPLE, self.list_dict)
+        host.register_output(C.OUTPUT_DICT_DICT, C.OUTPUT_NAME_SIMPLE, self.dict_dict)
+        host.register_output(C.OUTPUT_MESS, C.OUTPUT_NAME_SIMPLE, self.messages)
+        host.register_output(C.OUTPUT_COMPLEX, C.OUTPUT_NAME_SIMPLE, self.simple_print)
 
     def simple_print(self, data):
         self.host.disp(str(data))
@@ -109,19 +106,19 @@
 
     def __init__(self, host):
         self.host = host
-        host.register_output(C.OUTPUT_TEXT, JSON, self.dump)
-        host.register_output(C.OUTPUT_LIST, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_LIST, JSON_RAW, self.dump)
-        host.register_output(C.OUTPUT_DICT, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_DICT, JSON_RAW, self.dump)
-        host.register_output(C.OUTPUT_LIST_DICT, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_LIST_DICT, JSON_RAW, self.dump)
-        host.register_output(C.OUTPUT_DICT_DICT, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_DICT_DICT, JSON_RAW, self.dump)
-        host.register_output(C.OUTPUT_MESS, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_MESS, JSON_RAW, self.dump)
-        host.register_output(C.OUTPUT_COMPLEX, JSON, self.dump_pretty)
-        host.register_output(C.OUTPUT_COMPLEX, JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_TEXT, C.OUTPUT_NAME_JSON, self.dump)
+        host.register_output(C.OUTPUT_LIST, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_LIST, C.OUTPUT_NAME_JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_DICT, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_DICT, C.OUTPUT_NAME_JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_LIST_DICT, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_LIST_DICT, C.OUTPUT_NAME_JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_DICT_DICT, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_DICT_DICT, C.OUTPUT_NAME_JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_MESS, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_MESS, C.OUTPUT_NAME_JSON_RAW, self.dump)
+        host.register_output(C.OUTPUT_COMPLEX, C.OUTPUT_NAME_JSON, self.dump_pretty)
+        host.register_output(C.OUTPUT_COMPLEX, C.OUTPUT_NAME_JSON_RAW, self.dump)
 
     def dump(self, data):
         self.host.disp(json.dumps(data, default=str))