Don't switch to json, let dbus handle this

Closes: #723
Approved by: rhatdan

Atomic/diff.py

@@ -1,7 +1,6 @@
 import os
 import sys
 import rpm
-import json
 import tempfile
 from filecmp import dircmp
 from . import util
@@ -32,7 +31,7 @@ class Diff(Atomic):
     def diff_tty(self):
         diff_dict = self.diff()
         if self.args.json:
-            util.output_json(json.loads(diff_dict))
+            util.output_json(diff_dict)
 
     def diff(self):
         '''
@@ -69,11 +68,12 @@ class Diff(Atomic):
             # Clean up
             helpers.cleanup(image_list)
 
-            return json.dumps(helpers.json_out)
+            return helpers.json_out
 
         except KeyboardInterrupt:
             util.write_out("Quitting...")
             helpers.cleanup(image_list)
+        return []
 
 class DiffHelpers(object):
     """

Atomic/scan.py

@@ -49,7 +49,7 @@ class Scan(Atomic):
         self.mount_paths = {}
 
     def get_scanners_list(self):
-        return json.dumps(self.scanners)
+        return self.scanners
 
     def scan(self):
         def get_scan_info(scanner, scan_type):

tests/integration/test_dbus.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-for i in $(ls $(dirname $0)/dbus/*.sh); do
-    echo $i;
-done