diff options
author | Lars Wirzenius <liw@liw.fi> | 2017-11-19 18:50:00 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2017-11-19 18:50:00 +0100 |
commit | 3fa666a02be0100cefc765f46e6b2134daf85fb0 (patch) | |
tree | 1c452551c067e0158fb209af7d5910d1af6ed844 | |
parent | e8ffc8d614fdf40011b055e2fee27964d333b0eb (diff) | |
parent | 480474df057c0dde651de8065fa64991c22f6d55 (diff) | |
download | ick2-3fa666a02be0100cefc765f46e6b2134daf85fb0.tar.gz |
Merge: icktool reads YAML
-rw-r--r-- | NEWS | 3 | ||||
-rwxr-xr-x | icktool | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -27,6 +27,9 @@ Version 0.15+git, not yet released much use, but it's there and it's easier to add things to a dummy file than to start a new file. +* icktool now reads YAML, instead of JSON. However, as YAML is a + superset of JSON, old inputs will still wors. + * Some authorization fixes for the controller. Version 0.15, released 2017-11-13 @@ -24,6 +24,7 @@ import apifw import cliapp import Crypto.PublicKey.RSA import requests +import yaml import ick2 @@ -220,7 +221,7 @@ class Icktool(cliapp.Application): sys.stdout.write('\n') def _read_object(self): - return json.load(sys.stdin) + return yaml.load(sys.stdin) class API: |