erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jp (base, blog, output(std)): fixed bad unicode handling in stdout, use of jp.disp instead of simple print

Browse source
This commit is contained in:
Goffi 2017-02-21 21:01:40 +01:00
commit 8155bc3ee8
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
frontends/src/jp/output_std.py
View file

@ -31,37 +31,39 @@ JSON_RAW = u'json_raw'
class Simple(object):
"""Default outputs"""
def __init__(self, jp):
jp.register_output(C.OUTPUT_TEXT, SIMPLE, self.simple_print)
jp.register_output(C.OUTPUT_LIST, SIMPLE, self.list)
jp.register_output(C.OUTPUT_DICT, SIMPLE, self.dict)
jp.register_output(C.OUTPUT_COMPLEX, SIMPLE, self.simple_print)
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_COMPLEX, SIMPLE, self.simple_print)
def simple_print(self, data):
print data
self.host.disp(data)
def list(self, data):
print u'\n'.join(data)
self.host.disp(u'\n'.join(data))
def dict(self, data):
for k, v in data:
print(u'{key}: {value}'.format(key=k, value=v))
self.host.disp((u'{key}: {value}'.format(key=k, value=v)))
class Json(object):
"""outputs in json format"""
def __init__(self, jp):
jp.register_output(C.OUTPUT_TEXT, JSON, self.dump)
jp.register_output(C.OUTPUT_LIST, JSON, self.dump_pretty)
jp.register_output(C.OUTPUT_LIST, JSON_RAW, self.dump)
jp.register_output(C.OUTPUT_DICT, JSON, self.dump_pretty)
jp.register_output(C.OUTPUT_DICT, JSON_RAW, self.dump)
jp.register_output(C.OUTPUT_COMPLEX, JSON, self.dump_pretty)
jp.register_output(C.OUTPUT_COMPLEX, JSON_RAW, self.dump)
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_COMPLEX, JSON, self.dump_pretty)
host.register_output(C.OUTPUT_COMPLEX, JSON_RAW, self.dump)
def dump(self, data):
print json.dumps(data, default=str)
self.host.disp(json.dumps(data, default=str))
def dump_pretty(self, data):
print json.dumps(data, indent=4, default=str)
self.host.disp(json.dumps(data, indent=4, default=str))