[Server-devel] [PATCH 3/4] ds_backup.py: remove dbus and json dependencies

[martin.langhoff at gmail.com]

From: Martin Langhoff <martin at laptop.org>

Now that we don't talk to the datastore, drop
these dependencies.
---
 ds_backup.py |   29 -----------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/ds_backup.py b/ds_backup.py
index 3ae9df2..dabcf39 100755
--- a/ds_backup.py
+++ b/ds_backup.py
@@ -27,16 +27,9 @@ import glob
 import popen2
 import re
 
-import json
-import dbus
-
 from sugar import env
 from sugar import profile
 
-DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
-DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
-DS_DBUS_PATH = '/org/laptop/sugar/DataStore'
-
 class BackupError(Exception): pass
 class ProtocolVersionError(BackupError): pass
 class RefusedByServerError(BackupError): pass
@@ -45,14 +38,6 @@ class TransferError(BackupError): pass
 class NoPriorBackups(BackupError): pass
 class BulkRestoreUnavailable(BackupError): pass
 
-# FIXME: We should not be doing this for every entry. Cannot get JSON to accept
-# the dbus types?
-def _sanitize_dbus_dict(dbus_dict):
-    base_dict = {}
-    for key, value in dbus_dict.iteritems():
-        base_dict[unicode(key)] = unicode(value)
-    return base_dict
-
 def find_last_backup(server, xo_serial):
     try:
         ret = urllib.urlopen(server + '/last/%s' % xo_serial).read()
@@ -119,20 +104,6 @@ def rsync_to_xs(from_path, to_path, keyfile, user):
         raise TransferError('rsync error code %s, message:'
                             % rsync_exit, rsync_p.childerr.read())
 
-def _unpack_bulk_backup(restore_index):
-    bus = dbus.SessionBus()
-    obj = bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH)
-    datastore = dbus.Interface(obj, DS_DBUS_INTERFACE)
-
-    for line in file(restore_index):
-        props = json.read(line)
-    preview_path = os.path.join('preview', props['uid'])
-    if os.path.exists(preview_path):
-        preview = file(preview_path).read()
-        props['preview'] = dbus.ByteArray(preview_data)
-    props['uid'] = ''
-    datastore.create(props, file_path, transfer_ownership=True)
-
 def have_ofw_tree():
     return os.path.exists('/ofw')
 
-- 
1.5.4.34.g053d9