diff options
Diffstat (limited to 'src/jarabe/journal/volumestoolbar.py')
| -rw-r--r-- | src/jarabe/journal/volumestoolbar.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py index e1e6331..8b7f212 100644 --- a/src/jarabe/journal/volumestoolbar.py +++ b/src/jarabe/journal/volumestoolbar.py @@ -27,7 +27,7 @@ from gi.repository import Gdk from gi.repository import GConf import cPickle import xapian -import simplejson +import json import tempfile import shutil @@ -74,7 +74,7 @@ def _convert_entries(root): 'index')) except xapian.DatabaseError: logging.exception('Convert DS-0 Journal entries: error reading db: %s', - os.path.join(root, _JOURNAL_0_METADATA_DIR, 'index')) + os.path.join(root, _JOURNAL_0_METADATA_DIR, 'index')) return metadata_dir_path = os.path.join(root, model.JOURNAL_METADATA_DIR) @@ -151,7 +151,7 @@ def _convert_entry(root, document): metadata_fname) if not os.path.exists(metadata_path): (fh, fn) = tempfile.mkstemp(dir=root) - os.write(fh, simplejson.dumps(metadata)) + os.write(fh, json.dumps(metadata)) os.close(fh) os.rename(fn, metadata_path) @@ -183,7 +183,7 @@ class VolumesToolbar(Gtk.Toolbar): self.connect('destroy', self.__destroy_cb) - GObject.idle_add(self._set_up_volumes) + GLib.idle_add(self._set_up_volumes) def __destroy_cb(self, widget): volume_monitor = Gio.VolumeMonitor.get() @@ -196,7 +196,8 @@ class VolumesToolbar(Gtk.Toolbar): volume_monitor = Gio.VolumeMonitor.get() self._mount_added_hid = volume_monitor.connect('mount-added', self.__mount_added_cb) - self._mount_removed_hid = volume_monitor.connect('mount-removed', + self._mount_removed_hid = volume_monitor.connect( + 'mount-removed', self.__mount_removed_cb) for mount in volume_monitor.get_mounts(): @@ -229,7 +230,7 @@ class VolumesToolbar(Gtk.Toolbar): if os.path.exists(os.path.join(mount.get_root().get_path(), _JOURNAL_0_METADATA_DIR)): logging.debug('Convert DS-0 Journal entries: starting conversion') - GObject.idle_add(_convert_entries, mount.get_root().get_path()) + GLib.idle_add(_convert_entries, mount.get_root().get_path()) button = VolumeButton(mount) button.props.group = self._volume_buttons[0] @@ -291,7 +292,7 @@ class BaseButton(RadioToolButton): def _drag_data_received_cb(self, widget, drag_context, x, y, selection_data, info, timestamp): - object_id = selection_data.data + object_id = selection_data.get_data() metadata = model.get(object_id) file_path = model.get_file(metadata['uid']) if not file_path or not os.path.exists(file_path): @@ -336,8 +337,8 @@ class VolumeButton(BaseButton): def create_palette(self): palette = VolumePalette(self._mount) - #palette.props.invoker = FrameWidgetInvoker(self) - #palette.set_group_id('frame') + # palette.props.invoker = FrameWidgetInvoker(self) + # palette.set_group_id('frame') return palette @@ -383,7 +384,7 @@ class JournalButtonPalette(Palette): fraction = (total_space - free_space) / float(total_space) self._progress_bar.props.fraction = fraction self._free_space_label.props.label = _('%(free_space)d MB Free') % \ - {'free_space': free_space / (1024 * 1024)} + {'free_space': free_space / (1024 * 1024)} class DocumentsButton(BaseButton): |