From 4dd778baeaef3db914b783dcf2cc80bb653d8f13 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 23 Mar 2019 13:49:36 +0200
Subject: Refactor: DRY: move formatting JSON for output to its own method

---
 effitool | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/effitool b/effitool
index 8617b35..87b4a96 100755
--- a/effitool
+++ b/effitool
@@ -317,7 +317,7 @@ class Tool:
         token = self.get_admin_token(server)
         api = HTTPAPI(server['url'])
         memb = self._fetch_member(api, token, args['rid'])
-        print(json.dumps(memb, indent=4))
+        self._format_json(memb, sys.stdout)
 
     def update_member(self, args):
         rid = args['rid']
@@ -390,7 +390,7 @@ class Tool:
             rid: self._fetch_member(api, token, rid)
             for rid in rids
         }
-        json.dump(members, sys.stdout, indent=4)
+        self._format_json(members, sys.stdout)
 
     def _fetch_member(self, api, token, rid):
         headers = {
@@ -398,6 +398,9 @@ class Tool:
         }
         return api.get_json(token, '/memb', headers=headers)
 
+    def _format_json(self, obj, output):
+        return json.dump(obj, output, indent=4, sort_keys=True)
+
 
 def uniq(items):
     return list(sorted(set(items)))
-- 
cgit v1.2.1