Merge pull request #92 from DataDog/yann/pretty_json

[util] move `pretty_json` to datadog/util

datadog/dogshell/downtime.py

@@ -1,5 +1,6 @@
 # 3p
 import simplejson as json
+from datadog.util.format import pretty_json
 
 # datadog
 from datadog import api
@@ -58,7 +59,7 @@ def _schedule_downtime(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -71,7 +72,7 @@ def _update_downtime(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -91,7 +92,7 @@ def _show_downtime(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -103,6 +104,6 @@ def _show_all_downtime(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))

datadog/dogshell/host.py

@@ -1,5 +1,6 @@
 # 3p
 import simplejson as json
+from datadog.util.format import pretty_json
 
 # datadog
 from datadog import api
@@ -36,7 +37,7 @@ def _mute(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -48,6 +49,6 @@ def _unmute(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))

datadog/dogshell/monitor.py

@@ -1,5 +1,6 @@
 # 3p
 import simplejson as json
+from datadog.util.format import pretty_json
 
 # datadog
 from datadog import api
@@ -88,7 +89,7 @@ def _post(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -107,7 +108,7 @@ def _update(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -123,7 +124,7 @@ def _show(cls, args):
             res["id"] = str(res["id"])
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -140,7 +141,7 @@ def _show_all(cls, args):
                 d["id"] = str(d["id"])
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         elif format == 'raw':
             print(json.dumps(res))
         else:
@@ -174,7 +175,7 @@ def _mute_all(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -194,7 +195,7 @@ def _mute(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -205,6 +206,6 @@ def _unmute(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))

datadog/dogshell/screenboard.py

@@ -6,6 +6,7 @@
 
 # 3p
 import simplejson as json
+from datadog.util.format import pretty_json
 
 # datadog
 from datadog import api
@@ -131,7 +132,7 @@ def _push(cls, args):
             report_errors(res)
 
             if format == 'pretty':
-                print(cls._pretty_json(res))
+                print(pretty_json(res))
             else:
                 print(json.dumps(res))
 
@@ -180,7 +181,7 @@ def _post(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -203,7 +204,7 @@ def _update(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -225,7 +226,7 @@ def _show(cls, args):
             res["id"] = str(res["id"])
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -245,7 +246,7 @@ def _share(cls, args):
         res = api.Screenboard.share(args.screenboard_id)
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -256,7 +257,7 @@ def _revoke(cls, args):
         res = api.Screenboard.revoke(args.screenboard_id)
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -280,7 +281,7 @@ def _new_file(cls, args):
         cls._write_screen_to_file(res['id'], args.filename, args.timeout, format, args.string_ids)
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 

datadog/dogshell/service_check.py

@@ -1,5 +1,6 @@
 # 3p
 import simplejson as json
+from datadog.util.format import pretty_json
 
 # datadog
 from datadog import api
@@ -33,6 +34,6 @@ def _check(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))

datadog/dogshell/timeboard.py

@@ -10,6 +10,7 @@
 
 # datadog
 from datadog import api
+from datadog.util.format import pretty_json
 from datadog.dogshell.common import report_errors, report_warnings, print_err
 from datetime import datetime
 
@@ -109,7 +110,7 @@ def _title_to_filename(title):
             return no_punct.replace(" ", "_").replace("-", "_").strip("_")
 
         format = args.format
-        res = api.Timeboard.get_all()()
+        res = api.Timeboard.get_all()
         report_warnings(res)
         report_errors(res)
 
@@ -152,7 +153,7 @@ def _new_file(cls, args):
                                 args.timeout, format, args.string_ids)
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -214,7 +215,7 @@ def _push(cls, args):
             report_errors(res)
 
             if format == 'pretty':
-                print(cls._pretty_json(res))
+                print(pretty_json(res))
             else:
                 print(json.dumps(res))
 
@@ -237,7 +238,7 @@ def _post(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -259,7 +260,7 @@ def _update(cls, args):
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -275,7 +276,7 @@ def _show(cls, args):
             res["dash"]["id"] = str(res["dash"]["id"])
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         else:
             print(json.dumps(res))
 
@@ -292,7 +293,7 @@ def _show_all(cls, args):
                 d["id"] = str(d["id"])
 
         if format == 'pretty':
-            print(cls._pretty_json(res))
+            print(pretty_json(res))
         elif format == 'raw':
             print(json.dumps(res))
         else:
@@ -320,10 +321,6 @@ def _web_view(cls, args):
     def _escape(cls, s):
         return s.replace("\r", "\\r").replace("\n", "\\n").replace("\t", "\\t")
 
-    @classmethod
-    def _pretty_json(cls, obj):
-        return json.dumps(obj, sort_keys=True, indent=2)
-
 
 def _template_variables(tpl_var_input):
     if '[' not in tpl_var_input:

datadog/util/format.py

@@ -0,0 +1,6 @@
+# 3p
+import simplejson as json
+
+
+def pretty_json(obj):
+    return json.dumps(obj, sort_keys=True, indent=2)