Merge: icktool reads YAML

2 files changed, 5 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 6232313..4c1ff91 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/icktool b/icktool
index 9cea74a..d290001 100755
--- a/icktool
+++ b/icktool
@@ -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: