Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extensions/cpsection/aboutcomputer/model.py2
-rw-r--r--extensions/cpsection/updater/backends/aslo.py3
-rwxr-xr-xextensions/cpsection/updater/model.py4
-rw-r--r--extensions/deviceicon/battery.py8
-rw-r--r--extensions/deviceicon/volume.py2
-rw-r--r--src/jarabe/controlpanel/gui.py2
-rw-r--r--src/jarabe/desktop/favoriteslayout.py6
-rw-r--r--src/jarabe/desktop/favoritesview.py6
-rw-r--r--src/jarabe/desktop/homebox.py4
-rw-r--r--src/jarabe/desktop/meshbox.py2
-rw-r--r--src/jarabe/desktop/schoolserver.py6
-rw-r--r--src/jarabe/frame/activitiestray.py26
-rw-r--r--src/jarabe/frame/clipboard.py2
-rw-r--r--src/jarabe/frame/clipboardicon.py2
-rw-r--r--src/jarabe/frame/clipboardmenu.py4
-rw-r--r--src/jarabe/frame/clipboardobject.py2
-rw-r--r--src/jarabe/frame/clipboardpanelwindow.py6
-rw-r--r--src/jarabe/frame/clipboardtray.py14
-rw-r--r--src/jarabe/frame/frame.py4
-rw-r--r--src/jarabe/frame/zoomtoolbar.py2
-rw-r--r--src/jarabe/intro/window.py2
-rw-r--r--src/jarabe/journal/expandedentry.py4
-rw-r--r--src/jarabe/journal/journalactivity.py9
-rw-r--r--src/jarabe/journal/journaltoolbox.py2
-rw-r--r--src/jarabe/journal/listmodel.py2
-rw-r--r--src/jarabe/journal/listview.py4
-rw-r--r--src/jarabe/journal/misc.py12
-rw-r--r--src/jarabe/journal/model.py28
-rw-r--r--src/jarabe/journal/objectchooser.py4
-rw-r--r--src/jarabe/journal/palettes.py2
-rw-r--r--src/jarabe/journal/volumestoolbar.py6
-rw-r--r--src/jarabe/model/bundleregistry.py10
-rw-r--r--src/jarabe/model/filetransfer.py20
-rw-r--r--src/jarabe/model/friends.py8
-rw-r--r--src/jarabe/model/neighborhood.py10
-rw-r--r--src/jarabe/model/network.py30
-rw-r--r--src/jarabe/model/notifications.py4
-rw-r--r--src/jarabe/model/shell.py22
-rw-r--r--src/jarabe/view/keyhandler.py8
-rw-r--r--src/jarabe/view/launcher.py2
-rw-r--r--src/jarabe/view/palettes.py2
-rw-r--r--src/jarabe/view/viewsource.py12
42 files changed, 152 insertions, 158 deletions
diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
index 6cddb4c..898d79c 100644
--- a/extensions/cpsection/aboutcomputer/model.py
+++ b/extensions/cpsection/aboutcomputer/model.py
@@ -111,7 +111,7 @@ def _read_file(path):
value = value.strip('\n')
return value
else:
- _logger.debug('No information in file or directory: %s' % path)
+ _logger.debug('No information in file or directory: %s', path)
return None
def get_license():
diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py
index 8c01ec2..443fd1c 100644
--- a/extensions/cpsection/updater/backends/aslo.py
+++ b/extensions/cpsection/updater/backends/aslo.py
@@ -116,8 +116,7 @@ class _UpdateFetcher(object):
if document.find(_FIND_DESCRIPTION) is None:
logging.debug('Bundle %s not available in the server for the '
- 'version %s' % (self._bundle.get_bundle_id(),
- config.version))
+ 'version %s', self._bundle.get_bundle_id(), config.version)
version = None
link = None
size = None
diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
index 489cfa5..102edea 100755
--- a/extensions/cpsection/updater/model.py
+++ b/extensions/cpsection/updater/model.py
@@ -119,7 +119,7 @@ class UpdateModel(gobject.GObject):
self._downloader.connect('error', self.__downloader_error_cb)
def __downloader_progress_cb(self, downloader, progress):
- logging.debug('__downloader_progress_cb %r' % progress)
+ logging.debug('__downloader_progress_cb %r', progress)
total = self._total_bundles_to_update * 2
current = total - len(self._bundles_to_update) * 2 - 2 + progress
@@ -133,7 +133,7 @@ class UpdateModel(gobject.GObject):
self._downloader = None
def __downloader_error_cb(self, downloader, error_message):
- logging.error('Error downloading update:\n%s' % error_message)
+ logging.error('Error downloading update:\n%s', error_message)
total = self._total_bundles_to_update * 2
current = total - len(self._bundles_to_update) * 2
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 76b1565..edfcce4 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -189,28 +189,28 @@ class DeviceModel(gobject.GObject):
try:
return self._battery.GetProperty(_LEVEL_PROP)
except dbus.DBusException:
- logging.error('Cannot access %s' % _LEVEL_PROP)
+ logging.error('Cannot access %s', _LEVEL_PROP)
return 0
def _get_charging(self):
try:
return self._battery.GetProperty(_CHARGING_PROP)
except dbus.DBusException:
- logging.error('Cannot access %s' % _CHARGING_PROP)
+ logging.error('Cannot access %s', _CHARGING_PROP)
return False
def _get_discharging(self):
try:
return self._battery.GetProperty(_DISCHARGING_PROP)
except dbus.DBusException:
- logging.error('Cannot access %s' % _DISCHARGING_PROP)
+ logging.error('Cannot access %s', _DISCHARGING_PROP)
return False
def _get_present(self):
try:
return self._battery.GetProperty(_PRESENT_PROP)
except dbus.DBusException:
- logging.error('Cannot access %s' % _PRESENT_PROP)
+ logging.error('Cannot access %s', _PRESENT_PROP)
return False
def do_get_property(self, pspec):
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 5c4c49e..4ccae7a 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -97,7 +97,7 @@ def _mount(volume, tray):
volume.mount(gtk.MountOperation(tray.get_toplevel()), _mount_cb)
def _mount_cb(volume, result):
- logging.debug('_mount_cb %r %r' % (volume, result))
+ logging.debug('_mount_cb %r %r', volume, result)
volume.mount_finish(result)
def _mount_added_cb(volume_monitor, mount, tray):
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 3d226fa..7384a0d 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -352,7 +352,7 @@ class ModelWrapper(object):
try:
method(self._options[key])
except Exception, detail:
- _logger.debug('Error undo option: %s' % detail)
+ _logger.debug('Error undo option: %s', detail)
class _SectionIcon(gtk.EventBox):
__gtype_name__ = "SugarSectionIcon"
diff --git a/src/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py
index 506446f..3ff0ba8 100644
--- a/src/jarabe/desktop/favoriteslayout.py
+++ b/src/jarabe/desktop/favoriteslayout.py
@@ -57,14 +57,14 @@ class FavoritesLayout(gobject.GObject, hippo.CanvasLayout):
def append(self, icon, locked=False):
if not hasattr(type(icon), 'fixed_position'):
- logging.debug('Icon without fixed_position: %r' % icon)
+ logging.debug('Icon without fixed_position: %r', icon)
return
icon.props.size = max(icon.props.size, style.STANDARD_ICON_SIZE)
relative_x, relative_y = icon.fixed_position
if relative_x < 0 or relative_y < 0:
- logging.debug('Icon out of bounds: %r' % icon)
+ logging.debug('Icon out of bounds: %r', icon)
return
min_width_, width = self.box.get_width_request()
@@ -82,7 +82,7 @@ class FavoritesLayout(gobject.GObject, hippo.CanvasLayout):
raise ValueError('Child not in box.')
if not(hasattr(icon, 'get_bundle_id') and hasattr(icon, 'get_version')):
- logging.debug('Not an activity icon %r' % icon)
+ logging.debug('Not an activity icon %r', icon)
return
min_width_, width = self.box.get_width_request()
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 6ca8732..236ba2b 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -431,7 +431,7 @@ class ActivityIcon(CanvasIcon):
def __get_last_activity_async_cb(self, entries, error=None):
if error is not None:
- logging.error('Error retrieving most recent activities: %r' % error)
+ logging.error('Error retrieving most recent activities: %r', error)
return
# If there's a problem with the DS index, we may get entries not related
@@ -678,7 +678,7 @@ class FavoritesSetting(object):
def __init__(self):
client = gconf.client_get_default()
self._layout = client.get_string(self._FAVORITES_KEY)
- logging.debug('FavoritesSetting layout %r' % (self._layout))
+ logging.debug('FavoritesSetting layout %r', self._layout)
self._mode = None
@@ -688,7 +688,7 @@ class FavoritesSetting(object):
return self._layout
def set_layout(self, layout):
- logging.debug('set_layout %r %r' % (layout, self._layout))
+ logging.debug('set_layout %r %r', layout, self._layout)
if layout != self._layout:
self._layout = layout
diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py
index 88da9d2..0be1d05 100644
--- a/src/jarabe/desktop/homebox.py
+++ b/src/jarabe/desktop/homebox.py
@@ -89,8 +89,8 @@ class HomeBox(gtk.VBox):
try:
os.unlink(update_trigger_file)
except OSError:
- logging.error('Software-update: Can not remove file %s' %
- update_trigger_file)
+ logging.error('Software-update: Can not remove file %s',
+ update_trigger_file)
if response_id == gtk.RESPONSE_OK:
from jarabe.controlpanel.gui import ControlPanel
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index c37bba1..ba9c103 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -876,7 +876,7 @@ class MeshBox(gtk.VBox):
self._layout.remove(icon)
del self.access_points[ap_o]
else:
- logging.error('Can not remove access point %s' % ap_o)
+ logging.error('Can not remove access point %s', ap_o)
def suspend(self):
if not self._suspended:
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index 1dd9edc..2df2a40 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -46,12 +46,12 @@ def register_laptop(url=REGISTER_URL):
server = ServerProxy(url)
try:
data = server.register(sn, nick, uuid, profile.pubkey)
- except (Error, socket.error), e:
- logging.error('Registration: cannot connect to server: %s' % e)
+ except (Error, socket.error):
+ logging.exception('Registration: cannot connect to server')
raise RegisterError(_('Cannot connect to the server.'))
if data['success'] != 'OK':
- logging.error('Registration: server could not complete request: %s' %
+ logging.error('Registration: server could not complete request: %s',
data['error'])
raise RegisterError(_('The server could not complete the request.'))
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index 0025403..390cf88 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -335,7 +335,7 @@ class ActivitiesTray(HTray):
filetransfer.new_file_transfer.connect(self.__new_file_transfer_cb)
def __activity_added_cb(self, home_model, home_activity):
- logging.debug('__activity_added_cb: %r' % home_activity)
+ logging.debug('__activity_added_cb: %r', home_activity)
if self.get_children():
group = self.get_children()[0]
else:
@@ -348,7 +348,7 @@ class ActivitiesTray(HTray):
button.show()
def __activity_removed_cb(self, home_model, home_activity):
- logging.debug('__activity_removed_cb: %r' % home_activity)
+ logging.debug('__activity_removed_cb: %r', home_activity)
button = self._buttons[home_activity.get_activity_id()]
self.remove_item(button)
del self._buttons[home_activity.get_activity_id()]
@@ -366,14 +366,14 @@ class ActivitiesTray(HTray):
self.window.process_updates(True)
def __activity_changed_cb(self, home_model, home_activity):
- logging.debug('__activity_changed_cb: %r' % home_activity)
+ logging.debug('__activity_changed_cb: %r', home_activity)
# Only select the new activity, if there is no tabbing activity.
if home_model.get_tabbing_activity() is None:
self._activate_activity(home_activity)
def __tabbing_activity_changed_cb(self, home_model, home_activity):
- logging.debug('__tabbing_activity_changed_cb: %r' % home_activity)
+ logging.debug('__tabbing_activity_changed_cb: %r', home_activity)
# If the tabbing_activity is set to None just do nothing.
# The active activity will be updated a bit later (and it will
# be set to the activity that is currently selected).
@@ -424,7 +424,7 @@ class ActivitiesTray(HTray):
def __new_file_transfer_cb(self, **kwargs):
file_transfer = kwargs['file_transfer']
- logging.debug('__new_file_transfer_cb %r' % file_transfer)
+ logging.debug('__new_file_transfer_cb %r', file_transfer)
if isinstance(file_transfer, filetransfer.IncomingFileTransfer):
button = IncomingTransferButton(file_transfer)
@@ -463,8 +463,8 @@ class BaseTransferButton(ToolButton):
self.props.parent.remove(self)
def __notify_state_cb(self, file_transfer, pspec):
- logging.debug('_update state: %r %r' % (file_transfer.props.state,
- file_transfer.reason_last_change))
+ logging.debug('_update state: %r %r', file_transfer.props.state,
+ file_transfer.reason_last_change)
if file_transfer.props.state == filetransfer.FT_STATE_CANCELLED:
if file_transfer.reason_last_change == \
filetransfer.FT_REASON_LOCAL_STOPPED:
@@ -565,10 +565,10 @@ class IncomingTransferButton(BaseTransferButton):
return dbus.Interface(remote_object, DS_DBUS_INTERFACE)
def __reply_handler_cb(self):
- logging.debug('__reply_handler_cb %r' % self._object_id)
+ logging.debug('__reply_handler_cb %r', self._object_id)
def __error_handler_cb(self, error):
- logging.debug('__error_handler_cb %r %s' % (self._object_id, error))
+ logging.debug('__error_handler_cb %r %s', self._object_id, error)
def __dismiss_clicked_cb(self, palette):
self.remove()
@@ -654,7 +654,7 @@ class BaseTransferPalette(Palette):
return _('%dMB') % (size / 1048576)
def update_progress(self):
- logging.debug('update_progress: %r' %
+ logging.debug('update_progress: %r',
self.file_transfer.props.transferred_bytes)
if self.progress_bar is None:
@@ -663,7 +663,7 @@ class BaseTransferPalette(Palette):
self.progress_bar.props.fraction = \
self.file_transfer.props.transferred_bytes / \
float(self.file_transfer.file_size)
- logging.debug('update_progress: %r' % self.progress_bar.props.fraction)
+ logging.debug('update_progress: %r', self.progress_bar.props.fraction)
transferred = self._format_size(
self.file_transfer.props.transferred_bytes)
@@ -688,7 +688,7 @@ class IncomingTransferPalette(BaseTransferPalette):
self._update()
def _update(self):
- logging.debug('_update state: %r' % self.file_transfer.props.state)
+ logging.debug('_update state: %r', self.file_transfer.props.state)
if self.file_transfer.props.state == filetransfer.FT_STATE_PENDING:
menu_item = MenuItem(_('Accept'), icon_name='dialog-ok')
menu_item.connect('activate', self.__accept_activate_cb)
@@ -816,7 +816,7 @@ class OutgoingTransferPalette(BaseTransferPalette):
def _update(self):
new_state = self.file_transfer.props.state
- logging.debug('_update state: %r' % new_state)
+ logging.debug('_update state: %r', new_state)
if new_state == filetransfer.FT_STATE_PENDING:
menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel')
diff --git a/src/jarabe/frame/clipboard.py b/src/jarabe/frame/clipboard.py
index d18dd44..1cefcc1 100644
--- a/src/jarabe/frame/clipboard.py
+++ b/src/jarabe/frame/clipboard.py
@@ -77,7 +77,7 @@ class Clipboard(gobject.GObject):
cb_object = self._objects.pop(object_id)
cb_object.destroy()
self.emit('object-deleted', object_id)
- logging.debug('Deleted object with object_id %r' % object_id)
+ logging.debug('Deleted object with object_id %r', object_id)
def set_object_percent(self, object_id, percent):
cb_object = self._objects[object_id]
diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py
index ff63ad9..93a177e 100644
--- a/src/jarabe/frame/clipboardicon.py
+++ b/src/jarabe/frame/clipboardicon.py
@@ -96,7 +96,7 @@ class ClipboardIcon(RadioToolButton):
def _clipboard_data_get_cb(self, x_clipboard, selection, info, targets):
if not selection.target in [target[0] for target in targets]:
logging.warning('ClipboardIcon._clipboard_data_get_cb: asked %s' \
- ' but only have %r.' % (selection.target, targets))
+ ' but only have %r.', selection.target, targets)
return
data = self._cb_object.get_formats()[selection.target].get_data()
selection.set(selection.target, 8, data)
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index 8a8ba11..e2eba68 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -74,7 +74,7 @@ class ClipboardMenu(Palette):
def _update_open_submenu(self):
activities = self._get_activities()
- logging.debug('_update_open_submenu: %r' % activities)
+ logging.debug('_update_open_submenu: %r', activities)
child = self._open_item.get_child()
if activities is None or len(activities) <= 1:
child.set_text(_('Open'))
@@ -97,7 +97,7 @@ class ClipboardMenu(Palette):
activity_info = registry.get_bundle(service_name)
if not activity_info:
- logging.warning('Activity %s is unknown.' % service_name)
+ logging.warning('Activity %s is unknown.', service_name)
item = gtk.MenuItem(activity_info.get_name())
item.connect('activate', self._open_submenu_item_activate_cb,
diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py
index 91fa1e6..d6a55db 100644
--- a/src/jarabe/frame/clipboardobject.py
+++ b/src/jarabe/frame/clipboardobject.py
@@ -110,7 +110,7 @@ class ClipboardObject(object):
format_ = mime.get_for_file(uri.path)
else:
format_ = mime.get_from_file_name(uri.path)
- logging.debug('Choosed %r!' % format_)
+ logging.debug('Chose %r!', format_)
return format_
diff --git a/src/jarabe/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py
index 7093199..7d08d32 100644
--- a/src/jarabe/frame/clipboardpanelwindow.py
+++ b/src/jarabe/frame/clipboardpanelwindow.py
@@ -63,10 +63,10 @@ class ClipboardPanelWindow(FrameWindow):
for target in targets:
if target not in ('TIMESTAMP', 'TARGETS',
'MULTIPLE', 'SAVE_TARGETS'):
- logging.debug('Asking for target %s.' % target)
+ logging.debug('Asking for target %s.', target)
selection = x_clipboard.wait_for_contents(target)
if not selection:
- logging.warning('no data for selection target %s.' % target)
+ logging.warning('no data for selection target %s.', target)
continue
self._add_selection(key, selection)
@@ -74,7 +74,7 @@ class ClipboardPanelWindow(FrameWindow):
def _add_selection(self, key, selection):
if not selection.data:
- logging.warning('no data for selection target %s.' % selection.type)
+ logging.warning('no data for selection target %s.', selection.type)
return
logging.debug('adding type ' + selection.type + '.')
diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py
index a387328..75c1ecf 100644
--- a/src/jarabe/frame/clipboardtray.py
+++ b/src/jarabe/frame/clipboardtray.py
@@ -79,7 +79,7 @@ class ClipboardTray(tray.VTray):
if not selection.data:
return
- logging.debug('ClipboardTray: adding type %r' % selection.type)
+ logging.debug('ClipboardTray: adding type %r', selection.type)
cb_service = clipboard.get_instance()
if selection.type == 'text/uri-list':
@@ -115,13 +115,13 @@ class ClipboardTray(tray.VTray):
cb_service = clipboard.get_instance()
cb_service.delete_object(icon.get_object_id())
- logging.debug('ClipboardTray: %r was added' % cb_object.get_id())
+ logging.debug('ClipboardTray: %r was added', cb_object.get_id())
def _object_deleted_cb(self, cb_service, object_id):
icon = self._icons[object_id]
self.remove_item(icon)
del self._icons[object_id]
- logging.debug('ClipboardTray: %r was deleted' % object_id)
+ logging.debug('ClipboardTray: %r was deleted', object_id)
def drag_motion_cb(self, widget, context, x, y, time):
logging.debug('ClipboardTray._drag_motion_cb')
@@ -180,14 +180,14 @@ class ClipboardTray(tray.VTray):
def drag_data_received_cb(self, widget, context, x, y, selection,
targetType, time):
- logging.debug('ClipboardTray: got data for target %r'
- % selection.target)
+ logging.debug('ClipboardTray: got data for target %r',
+ selection.target)
object_id = self._context_map.get_object_id(context)
try:
if selection is None:
- logging.warn('ClipboardTray: empty selection for target %s'
- % selection.target)
+ logging.warn('ClipboardTray: empty selection for target %s',
+ selection.target)
elif selection.target == 'XdndDirectSave0':
if selection.data == 'S':
window = context.source_window
diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
index 0bb8d92..1e02fc8 100644
--- a/src/jarabe/frame/frame.py
+++ b/src/jarabe/frame/frame.py
@@ -318,7 +318,7 @@ class Frame(object):
def remove_notification(self, icon):
if icon not in self._notif_by_icon:
- logging.debug('icon %r not in list of notifications.' % icon)
+ logging.debug('icon %r not in list of notifications.', icon)
return
window = self._notif_by_icon[icon]
@@ -326,7 +326,7 @@ class Frame(object):
del self._notif_by_icon[icon]
def __notification_received_cb(self, **kwargs):
- logging.debug('__notification_received_cb %r' % kwargs)
+ logging.debug('__notification_received_cb %r', kwargs)
icon = NotificationIcon()
hints = kwargs['hints']
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index 439f6a3..4f44600 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -75,7 +75,7 @@ class ZoomToolbar(gtk.Toolbar):
self._set_zoom_level(kwargs['new_level'])
def _set_zoom_level(self, new_level):
- logging.debug('new zoom level: %r' % new_level)
+ logging.debug('new zoom level: %r', new_level)
if new_level == shell.ShellModel.ZOOM_MESH:
self._mesh_button.props.active = True
elif new_level == shell.ShellModel.ZOOM_GROUP:
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 0e0cbb3..94c6782 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -55,7 +55,7 @@ def create_profile(name, color=None, pixbuf=None):
cmd = "ssh-keygen -q -t dsa -f %s -C '' -N ''" % keypath
(s, o) = commands.getstatusoutput(cmd)
if s != 0:
- logging.error("Could not generate key pair: %d %s" % (s, o))
+ logging.error("Could not generate key pair: %d %s", s, o)
else:
logging.error("Keypair exists, skip generation.")
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 6ef531b..88c0b41 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -187,8 +187,8 @@ class ExpandedEntry(hippo.CanvasBox):
try:
surface = cairo.ImageSurface.create_from_png(png_file)
has_preview = True
- except Exception, e:
- logging.error('Error while loading the preview: %r' % e)
+ except Exception:
+ logging.exception('Error while loading the preview')
has_preview = False
else:
has_preview = False
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 80204a1..08a5a0f 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -236,7 +236,7 @@ class JournalActivity(Window):
return True
def __volume_changed_cb(self, volume_toolbar, mount_point):
- logging.debug('Selected volume: %r.' % mount_point)
+ logging.debug('Selected volume: %r.', mount_point)
self._main_toolbox.search_toolbar.set_mount_point(mount_point)
self._main_toolbox.set_current_toolbar(0)
@@ -281,8 +281,7 @@ class JournalActivity(Window):
try:
registry.install(bundle)
except (ZipExtractException, RegistrationException):
- logging.warning('Could not install bundle %s:\n%s' % \
- (bundle.get_path(), traceback.format_exc()))
+ logging.exception('Could not install bundle %s', bundle.get_path())
return
if metadata['mime_type'] == JournalEntryBundle.MIME_TYPE:
@@ -297,14 +296,14 @@ class JournalActivity(Window):
search_toolbar.give_entry_focus()
def __window_state_event_cb(self, window, event):
- logging.debug('window_state_event_cb %r' % self)
+ logging.debug('window_state_event_cb %r', self)
if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED:
state = event.new_window_state
visible = not state & gtk.gdk.WINDOW_STATE_ICONIFIED
self._list_view.set_is_visible(visible)
def __visibility_notify_event_cb(self, window, event):
- logging.debug('visibility_notify_event_cb %r' % self)
+ logging.debug('visibility_notify_event_cb %r', self)
visible = event.state != gtk.gdk.VISIBILITY_FULLY_OBSCURED
self._list_view.set_is_visible(visible)
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index af6e20e..201bf76 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -258,7 +258,7 @@ class SearchToolbar(gtk.Toolbar):
break
if what_filter_index == -1:
- logging.warning('what_filter %r not known' % what_filter)
+ logging.warning('what_filter %r not known', what_filter)
else:
self._what_search_combo.set_active(what_filter_index)
diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py
index a5586b7..917fbb1 100644
--- a/src/jarabe/journal/listmodel.py
+++ b/src/jarabe/journal/listmodel.py
@@ -193,7 +193,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
if selection.target == 'text/uri-list':
# Get hold of a reference so the temp file doesn't get deleted
self._temp_drag_file_path = model.get_file(uid)
- logging.debug('putting %r in selection' % self._temp_drag_file_path)
+ logging.debug('putting %r in selection', self._temp_drag_file_path)
selection.set(selection.target, 8, self._temp_drag_file_path)
return True
elif selection.target == 'journal-object-id':
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 332edc9..251388d 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -277,7 +277,7 @@ class BaseListView(gtk.Bin):
self.refresh()
def refresh(self):
- logging.debug('ListView.refresh query %r' % self._query)
+ logging.debug('ListView.refresh query %r', self._query)
self._stop_progress_bar()
self._start_progress_bar()
@@ -411,7 +411,7 @@ class BaseListView(gtk.Bin):
self.refresh()
def set_is_visible(self, visible):
- logging.debug('canvas_visibility_notify_event_cb %r' % visible)
+ logging.debug('canvas_visibility_notify_event_cb %r', visible)
if visible:
self._fully_obscured = False
if self._dirty:
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 5a9feb0..e6e5abf 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -44,7 +44,7 @@ def _get_icon_for_mime(mime_type):
return file_name
icons = gio.content_type_get_icon(mime_type)
- logging.debug('icons for this file: %r' % icons.props.names)
+ logging.debug('icons for this file: %r', icons.props.names)
for icon_name in icons.props.names:
file_name = get_icon_file_name(icon_name)
if file_name is not None:
@@ -96,27 +96,27 @@ def get_bundle(metadata):
if is_activity_bundle(metadata):
file_path = util.TempFilePath(model.get_file(metadata['uid']))
if not os.path.exists(file_path):
- logging.warning('Invalid path: %r' % file_path)
+ logging.warning('Invalid path: %r', file_path)
return None
return ActivityBundle(file_path)
elif is_content_bundle(metadata):
file_path = util.TempFilePath(model.get_file(metadata['uid']))
if not os.path.exists(file_path):
- logging.warning('Invalid path: %r' % file_path)
+ logging.warning('Invalid path: %r', file_path)
return None
return ContentBundle(file_path)
elif is_journal_bundle(metadata):
file_path = util.TempFilePath(model.get_file(metadata['uid']))
if not os.path.exists(file_path):
- logging.warning('Invalid path: %r' % file_path)
+ logging.warning('Invalid path: %r', file_path)
return None
return JournalEntryBundle(file_path)
else:
return None
except MalformedBundleException, e:
- logging.warning('Incorrect bundle: %r' % e)
+ logging.warning('Incorrect bundle: %r', e)
return None
def _get_activities_for_mime(mime_type):
@@ -196,7 +196,7 @@ def resume(metadata, bundle_id=None):
if bundle_id is None:
activities = get_activities(metadata)
if not activities:
- logging.warning('No activity can open this object, %s.' %
+ logging.warning('No activity can open this object, %s.',
metadata.get('mime_type', None))
return
bundle_id = activities[0].get_bundle_id()
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index e710464..15259bb 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -20,7 +20,6 @@ from datetime import datetime
import time
import shutil
from stat import S_IFMT, S_IFDIR, S_IFREG
-import traceback
import re
import gobject
@@ -119,7 +118,7 @@ class BaseResultSet(object):
self._position = position
def read(self):
- logging.debug('ResultSet.read position: %r' % self._position)
+ logging.debug('ResultSet.read position: %r', self._position)
if self._position == -1:
self.seek(0)
@@ -142,8 +141,8 @@ class BaseResultSet(object):
# Total cache miss: remake it
limit = self._page_size * MIN_PAGES_TO_CACHE
offset = max(0, self._position - limit / 2)
- logging.debug('remaking cache, offset: %r limit: %r' % \
- (offset, limit))
+ logging.debug('remaking cache, offset: %r limit: %r', offset,
+ limit)
query = self._query.copy()
query['limit'] = limit
query['offset'] = offset
@@ -156,8 +155,8 @@ class BaseResultSet(object):
elif remaining_forward_entries <= 0 and remaining_backwards_entries > 0:
# Add one page to the end of cache
- logging.debug('appending one more page, offset: %r' % \
- last_cached_entry)
+ logging.debug('appending one more page, offset: %r',
+ last_cached_entry)
query = self._query.copy()
query['limit'] = self._page_size
query['offset'] = last_cached_entry
@@ -180,8 +179,8 @@ class BaseResultSet(object):
limit = min(self._offset, self._page_size)
self._offset = max(0, self._offset - limit)
- logging.debug('prepending one more page, offset: %r limit: %r' %
- (self._offset, limit))
+ logging.debug('prepending one more page, offset: %r limit: %r',
+ self._offset, limit)
query = self._query.copy()
query['limit'] = self._page_size
query['offset'] = self._offset
@@ -289,7 +288,7 @@ class InplaceResultSet(BaseResultSet):
metadata['mountpoint'] = self._mount_point
entries.append(metadata)
- logging.debug('InplaceResultSet.find took %f s.' % (time.time() - t))
+ logging.debug('InplaceResultSet.find took %f s.', time.time() - t)
return entries, total_count
@@ -331,8 +330,7 @@ class InplaceResultSet(BaseResultSet):
self.progress.send(self)
except Exception:
- logging.error('Error reading file %r: %s' % \
- (full_path, traceback.format_exc()))
+ logging.exception('Error reading file %r', full_path)
if self._pending_directories == 0:
self.setup_ready()
@@ -412,10 +410,10 @@ def get_file(object_id):
"""Returns the file for an object
"""
if os.path.exists(object_id):
- logging.debug('get_file asked for file with path %r' % object_id)
+ logging.debug('get_file asked for file with path %r', object_id)
return object_id
else:
- logging.debug('get_file asked for entry with id %r' % object_id)
+ logging.debug('get_file asked for entry with id %r', object_id)
file_path = _get_datastore().get_filename(object_id)
if file_path:
return util.TempFilePath(file_path)
@@ -450,8 +448,8 @@ def copy(metadata, mount_point):
def write(metadata, file_path='', update_mtime=True):
"""Creates or updates an entry for that id
"""
- logging.debug('model.write %r %r %r' % (metadata.get('uid', ''), file_path,
- update_mtime))
+ logging.debug('model.write %r %r %r', metadata.get('uid', ''), file_path,
+ update_mtime)
if update_mtime:
metadata['mtime'] = datetime.now().isoformat()
metadata['timestamp'] = int(time.time())
diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py
index 32bfbb3..31bdba8 100644
--- a/src/jarabe/journal/objectchooser.py
+++ b/src/jarabe/journal/objectchooser.py
@@ -128,11 +128,11 @@ class ObjectChooser(gtk.Window):
self._list_view.update_with_query(query)
def __volume_changed_cb(self, volume_toolbar, mount_point):
- logging.debug('Selected volume: %r.' % mount_point)
+ logging.debug('Selected volume: %r.', mount_point)
self._toolbar.set_mount_point(mount_point)
def __visibility_notify_event_cb(self, window, event):
- logging.debug('visibility_notify_event_cb %r' % self)
+ logging.debug('visibility_notify_event_cb %r', self)
visible = event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED
self._list_view.set_is_visible(visible)
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 341a09f..49cc676 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -126,7 +126,7 @@ class ObjectPalette(Palette):
def __clipboard_get_func_cb(self, clipboard, selection_data, info, data):
# Get hold of a reference so the temp file doesn't get deleted
self._temp_file_path = model.get_file(self._metadata['uid'])
- logging.debug('__clipboard_get_func_cb %r' % self._temp_file_path)
+ logging.debug('__clipboard_get_func_cb %r', self._temp_file_path)
selection_data.set_uris(['file://' + self._temp_file_path])
def __clipboard_clear_func_cb(self, clipboard, data):
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index b21832e..6cb3f8d 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -76,7 +76,7 @@ class VolumesToolbar(gtk.Toolbar):
self._remove_button(mount)
def _add_button(self, mount):
- logging.debug('VolumeToolbar._add_button: %r' % mount.get_name())
+ logging.debug('VolumeToolbar._add_button: %r', mount.get_name())
button = VolumeButton(mount)
button.props.group = self._volume_buttons[0]
@@ -99,14 +99,14 @@ class VolumesToolbar(gtk.Toolbar):
mount.unmount(self.__unmount_cb)
def __unmount_cb(self, source, result):
- logging.debug('__unmount_cb %r %r' % (source, result))
+ logging.debug('__unmount_cb %r %r', source, result)
def _get_button_for_mount(self, mount):
mount_point = mount.get_root().get_path()
for button in self.get_children():
if button.mount_point == mount_point:
return button
- logging.error('Couldnt find button with mount_point %r' % mount_point)
+ logging.error('Couldnt find button with mount_point %r', mount_point)
return None
def _remove_button(self, mount):
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 3e5e586..1d23f0c 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -68,8 +68,7 @@ class BundleRegistry(gobject.GObject):
try:
self._load_favorites()
except Exception:
- logging.error('Error while loading favorite_activities\n%s.' \
- % traceback.format_exc())
+ logging.exception('Error while loading favorite_activities.')
self._merge_default_favorites()
@@ -154,7 +153,7 @@ class BundleRegistry(gobject.GObject):
if max_version > -1 and key not in self._favorite_bundles:
self._favorite_bundles[key] = None
- logging.debug('After merging: %r' % self._favorite_bundles)
+ logging.debug('After merging: %r', self._favorite_bundles)
self._write_favorites_file()
@@ -211,14 +210,13 @@ class BundleRegistry(gobject.GObject):
return False
def _add_bundle(self, bundle_path, install_mime_type=False):
- logging.debug('STARTUP: Adding bundle %r' % bundle_path)
+ logging.debug('STARTUP: Adding bundle %r', bundle_path)
try:
bundle = ActivityBundle(bundle_path)
if install_mime_type:
bundle.install_mime_type(bundle_path)
except MalformedBundleException:
- logging.error('Error loading bundle %r:\n%s' % (bundle_path,
- traceback.format_exc()))
+ logging.exception('Error loading bundle %r', bundle_path)
return None
if self.get_bundle(bundle.get_bundle_id()):
diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py
index d0d28fa..3c188ff 100644
--- a/src/jarabe/model/filetransfer.py
+++ b/src/jarabe/model/filetransfer.py
@@ -147,7 +147,7 @@ class BaseFileTransfer(gobject.GObject):
handle)
def __transferred_bytes_changed_cb(self, transferred_bytes):
- logging.debug('__transferred_bytes_changed_cb %r' % transferred_bytes)
+ logging.debug('__transferred_bytes_changed_cb %r', transferred_bytes)
self.props.transferred_bytes = transferred_bytes
def _set_transferred_bytes(self, transferred_bytes):
@@ -160,11 +160,11 @@ class BaseFileTransfer(gobject.GObject):
getter=_get_transferred_bytes, setter=_set_transferred_bytes)
def __initial_offset_defined_cb(self, offset):
- logging.debug('__initial_offset_defined_cb %r' % offset)
+ logging.debug('__initial_offset_defined_cb %r', offset)
self.initial_offset = offset
def __state_changed_cb(self, state, reason):
- logging.debug('__state_changed_cb %r %r' % (state, reason))
+ logging.debug('__state_changed_cb %r %r', state, reason)
self.reason_last_change = reason
self.props.state = state
@@ -205,7 +205,7 @@ class IncomingFileTransfer(BaseFileTransfer):
SOCKET_ACCESS_CONTROL_LOCALHOST, '', 0, byte_arrays=True)
def __notify_state_cb(self, file_transfer, pspec):
- logging.debug('__notify_state_cb %r' % self.props.state)
+ logging.debug('__notify_state_cb %r', self.props.state)
if self.props.state == FT_STATE_OPEN:
# Need to hold a reference to the socket so that python doesn't
# close the fd when it goes out of scope
@@ -276,14 +276,14 @@ class OutgoingFileTransfer(BaseFileTransfer):
'org.laptop.Sugar.Presence.Buddy')
handles = ps_buddy.GetTelepathyHandles()
- logging.debug('_get_buddy_handle %r' % handles)
+ logging.debug('_get_buddy_handle %r', handles)
bus_name, object_path, handle = handles[0]
return handle
def __notify_state_cb(self, file_transfer, pspec):
- logging.debug('__notify_state_cb %r' % self.props.state)
+ logging.debug('__notify_state_cb %r', self.props.state)
if self.props.state == FT_STATE_OPEN:
# Need to hold a reference to the socket so that python doesn't
# closes the fd when it goes out of scope
@@ -291,7 +291,7 @@ class OutgoingFileTransfer(BaseFileTransfer):
self._socket.connect(self._socket_address)
output_stream = gio.unix.OutputStream(self._socket.fileno(), True)
- logging.debug('opening %s for reading' % self._file_name)
+ logging.debug('opening %s for reading', self._file_name)
input_stream = gio.File(self._file_name).read()
if self.initial_offset > 0:
input_stream.skip(self.initial_offset)
@@ -308,14 +308,14 @@ def _new_channels_cb(connection, channels):
if props[CHANNEL + '.ChannelType'] == CHANNEL_TYPE_FILE_TRANSFER and \
not props[CHANNEL + '.Requested']:
- logging.debug('__new_channels_cb %r' % object_path)
+ logging.debug('__new_channels_cb %r', object_path)
incoming_file_transfer = IncomingFileTransfer(connection,
object_path, props)
new_file_transfer.send(None, file_transfer=incoming_file_transfer)
def _monitor_connection(connection):
- logging.debug('connection added %r' % connection)
+ logging.debug('connection added %r', connection)
connection[CONNECTION_INTERFACE_REQUESTS].connect_to_signal('NewChannels',
lambda channels: _new_channels_cb(connection, channels))
@@ -323,7 +323,7 @@ def _connection_addded_cb(conn_watcher, connection):
_monitor_connection(connection)
def _connection_removed_cb(conn_watcher, connection):
- logging.debug('connection removed %r' % connection)
+ logging.debug('connection removed %r', connection)
_conn_watcher = None
diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py
index 27a11dd..b7bf7f1 100644
--- a/src/jarabe/model/friends.py
+++ b/src/jarabe/model/friends.py
@@ -72,8 +72,8 @@ class Friends(gobject.GObject):
continue
buddy = BuddyModel(key=key, nick=cp.get(key, 'nick'))
self.add_friend(buddy)
- except Exception, exc:
- logging.error("Error parsing friends file: %s" % exc)
+ except Exception:
+ logging.exception('Error parsing friends file')
def save(self):
cp = ConfigParser()
@@ -98,8 +98,8 @@ class Friends(gobject.GObject):
pass
def friends_synced_error(e):
- logging.error("Error asking presence service to sync friends: %s"
- % e)
+ logging.error('Error asking presence service to sync friends: %s',
+ e)
keys = []
for friend in self:
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index f4ef9ac..2b223e4 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -122,16 +122,16 @@ class Neighborhood(gobject.GObject):
gconf_client = gconf.client_get_default()
key = '/desktop/sugar/collaboration/publish_gadget'
publish = gconf_client.get_bool(key)
- logging.debug("Gadget discovered on connection %s."
- " Publish our status: %r" %
- (conn.service_name.split('.')[-1], publish))
+ logging.debug('Gadget discovered on connection %s.'
+ ' Publish our status: %r', conn.service_name.split('.')[-1],
+ publish)
conn[CONN_INTERFACE_GADGET].Publish(publish)
self._request_random_buddies(conn, NB_RANDOM_BUDDIES)
self._request_random_activities(conn, NB_RANDOM_ACTIVITIES)
def _request_random_buddies(self, conn, nb):
- logging.debug("Request %d random buddies" % nb)
+ logging.debug('Request %d random buddies', nb)
path, props_ = conn[CONNECTION_INTERFACE_REQUESTS].CreateChannel(
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
@@ -145,7 +145,7 @@ class Neighborhood(gobject.GObject):
lambda: self._request_random_buddies(conn, nb)))
def _request_random_activities(self, conn, nb):
- logging.debug("Request %d random activities" % nb)
+ logging.debug('Request %d random activities', nb)
path, props_ = conn[CONNECTION_INTERFACE_REQUESTS].CreateChannel(
{ 'org.freedesktop.Telepathy.Channel.ChannelType':
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index 2607005..4dbc309 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -254,8 +254,8 @@ class NMSettingsConnection(dbus.service.Object):
if not config.read(config_path):
logging.error('Error reading the nm config file')
return
- except ConfigParser.ParsingError, e:
- logging.error('Error reading the nm config file: %s' % e)
+ except ConfigParser.ParsingError:
+ logging.exception('Error reading the nm config file')
return
identifier = self._settings.connection.id
@@ -292,13 +292,13 @@ class NMSettingsConnection(dbus.service.Object):
elif self._settings.wireless_security.key_mgmt == 'wpa-psk':
config.set(identifier, 'key', self._secrets.psk)
except ConfigParser.Error, e:
- logging.error('Error constructing %s: %s' % (identifier, e))
+ logging.exception('Error constructing %s', identifier)
else:
f = open(config_path, 'w')
try:
config.write(f)
- except ConfigParser.Error, e:
- logging.error('Can not write %s error: %s' % (config_path, e))
+ except ConfigParser.Error:
+ logging.exception('Can not write %s', config_path)
f.close()
@dbus.service.method(dbus_interface=NM_CONNECTION_IFACE,
@@ -310,16 +310,16 @@ class NMSettingsConnection(dbus.service.Object):
async_callbacks=('reply', 'error'),
in_signature='sasb', out_signature='a{sa{sv}}')
def GetSecrets(self, setting_name, hints, request_new, reply, error):
- logging.debug('Secrets requested for connection %s request_new=%s'
- % (self.path, request_new))
+ logging.debug('Secrets requested for connection %s request_new=%s',
+ self.path, request_new)
if request_new or self._secrets is None:
# request_new is for example the case when the pw on the AP changes
response = SecretsResponse(self, reply, error)
try:
self.secrets_request.send(self, response=response)
- except Exception, e:
- logging.error('Error requesting the secrets via dialog: %s' % e)
+ except Exception:
+ logging.exception('Error requesting the secrets via dialog')
else:
reply(self._secrets.get_dict())
@@ -328,8 +328,8 @@ def get_settings():
if _nm_settings is None:
try:
_nm_settings = NMSettings()
- except dbus.DBusException, e:
- logging.error('Cannot create the UserSettings service %s.', e)
+ except dbus.DBusException:
+ logging.exception('Cannot create the UserSettings service.')
load_connections()
return _nm_settings
@@ -367,8 +367,8 @@ def load_connections():
if not config.read(config_path):
logging.error('Error reading the nm config file')
return
- except ConfigParser.ParsingError, e:
- logging.error('Error reading the nm config file: %s' % e)
+ except ConfigParser.ParsingError:
+ logging.exception('Error reading the nm config file')
return
for section in config.sections():
@@ -412,7 +412,7 @@ def load_connections():
if config.has_option(section, 'pairwise'):
value = config.get(section, 'pairwise')
settings.wireless_security.pairwise = value
- except ConfigParser.Error, e:
- logging.error('Error reading section: %s' % e)
+ except ConfigParser.Error:
+ logging.exception('Error reading section')
else:
add_connection(ssid, settings, secrets)
diff --git a/src/jarabe/model/notifications.py b/src/jarabe/model/notifications.py
index da5c590..a2345f7 100644
--- a/src/jarabe/model/notifications.py
+++ b/src/jarabe/model/notifications.py
@@ -42,8 +42,8 @@ class NotificationService(dbus.service.Object):
def Notify(self, app_name, replaces_id, app_icon, summary, body, actions,
hints, expire_timeout):
- logging.debug('Received notification: %r' % ([app_name, replaces_id,
- app_icon, summary, body, actions, hints, expire_timeout]))
+ logging.debug('Received notification: %r', [app_name, replaces_id,
+ app_icon, summary, body, actions, hints, expire_timeout])
if replaces_id > 0:
notification_id = replaces_id
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index d7810ba..ec315ca 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -269,7 +269,7 @@ class Activity(gobject.GObject):
pass
def _set_active_error(self, err):
- logging.error("set_active() failed: %s" % err)
+ logging.error("set_active() failed: %s", err)
class ShellModel(gobject.GObject):
"""Model of the shell (activity management)
@@ -474,8 +474,8 @@ class ShellModel(gobject.GObject):
self.emit('launch-completed', home_activity)
startup_time = time.time() - home_activity.get_launch_time()
- logging.debug('%s launched in %f seconds.' %
- (home_activity.get_type(), startup_time))
+ logging.debug('%s launched in %f seconds.',
+ home_activity.get_type(), startup_time)
if self._active_activity is None:
self._set_active_activity(home_activity)
@@ -537,7 +537,7 @@ class ShellModel(gobject.GObject):
if home_activity:
self._remove_activity(home_activity)
else:
- logging.error('Model for window %d does not exist.' % xid)
+ logging.error('Model for window %d does not exist.', xid)
def notify_launch(self, activity_id, service_name):
registry = get_registry()
@@ -562,13 +562,13 @@ class ShellModel(gobject.GObject):
def notify_launch_failed(self, activity_id):
home_activity = self.get_activity_by_id(activity_id)
if home_activity:
- logging.debug("Activity %s (%s) launch failed" % \
- (activity_id, home_activity.get_type()))
+ logging.debug("Activity %s (%s) launch failed", activity_id,
+ home_activity.get_type())
home_activity.props.launching = False
self._remove_activity(home_activity)
else:
- logging.error('Model for activity id %s does not exist.'
- % activity_id)
+ logging.error('Model for activity id %s does not exist.',
+ activity_id)
self.emit('launch-failed', home_activity)
@@ -576,12 +576,12 @@ class ShellModel(gobject.GObject):
home_activity = self.get_activity_by_id(activity_id)
if not home_activity:
- logging.debug('Activity %s has been closed already.' % activity_id)
+ logging.debug('Activity %s has been closed already.', activity_id)
return False
if home_activity.props.launching:
- logging.debug('Activity %s still launching, assuming it failed...'
- % activity_id)
+ logging.debug('Activity %s still launching, assuming it failed.',
+ activity_id)
self.notify_launch_failed(activity_id)
return False
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 0505c52..f81d24b 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -91,7 +91,7 @@ class KeyHandler(object):
if f.endswith('.py') and not f.startswith('__'):
module_name = f[:-3]
try:
- logging.debug('Loading module %r' % module_name)
+ logging.debug('Loading module %r', module_name)
module = __import__('globalkey.' + module_name, globals(),
locals(), [module_name])
for key in module.BOUND_KEYS:
@@ -134,10 +134,10 @@ class KeyHandler(object):
return self._speech_proxy
def _on_speech_err(self, ex):
- logging.error("An error occurred with the ESpeak service: %r" % (ex, ))
+ logging.error('An error occurred with the ESpeak service: %r', ex)
def _primary_selection_cb(self, clipboard, text, user_data):
- logging.debug('KeyHandler._primary_selection_cb: %r' % text)
+ logging.debug('KeyHandler._primary_selection_cb: %r', text)
if text:
self._get_speech_proxy().SayText(text, reply_handler=lambda: None, \
error_handler=self._on_speech_err)
@@ -200,7 +200,7 @@ class KeyHandler(object):
def _key_pressed_cb(self, grabber, keycode, state, event_time):
key = grabber.get_key(keycode, state)
- logging.debug('_key_pressed_cb: %i %i %s' % (keycode, state, key))
+ logging.debug('_key_pressed_cb: %i %i %s', keycode, state, key)
if key:
self._key_pressed = key
self._keycode_pressed = keycode
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index 83a141a..643baee 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -157,4 +157,4 @@ def _destroy_launcher(home_activity):
_launchers[activity_id].destroy()
del _launchers[activity_id]
else:
- logging.error('Launcher for %s is missing' % activity_id)
+ logging.error('Launcher for %s is missing', activity_id)
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 951500f..fe711fc 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -229,7 +229,7 @@ class VolumePalette(Palette):
self._mount.unmount(self.__unmount_cb)
def __unmount_cb(self, mount, result):
- logging.debug('__unmount_cb %r %r' % (mount, result))
+ logging.debug('__unmount_cb %r %r', mount, result)
mount.unmount_finish(result)
def __popup_cb(self, palette):
diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py
index 870b176..43f668a 100644
--- a/src/jarabe/view/viewsource.py
+++ b/src/jarabe/view/viewsource.py
@@ -64,8 +64,8 @@ def setup_view_source(activity):
bundle_path = activity.get_bundle_path()
if window_xid in map_activity_to_window:
- _logger.debug('Viewsource window already open for %s %s' % \
- (window_xid, bundle_path))
+ _logger.debug('Viewsource window already open for %s %s', window_xid,
+ bundle_path)
return
document_path = None
@@ -95,7 +95,7 @@ class ViewSource(gtk.Window):
def __init__(self, window_xid, bundle_path, document_path, title):
gtk.Window.__init__(self)
- logging.debug('ViewSource paths: %r %r' % (bundle_path, document_path))
+ logging.debug('ViewSource paths: %r %r', bundle_path, document_path)
self.set_decorated(False)
self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
@@ -248,7 +248,7 @@ class DocumentButton(RadioToolButton):
self._jobject.destroy()
def __internal_save_error_cb(self, err):
- logging.debug("Error saving Source object to datastore: %s" % err)
+ logging.debug('Error saving Source object to datastore: %s', err)
self._jobject.destroy()
class Toolbar(gtk.Toolbar):
@@ -439,7 +439,7 @@ class SourceDisplay(gtk.ScrolledWindow):
return
mime_type = mime.get_for_file(self._file_path)
- logging.debug('Detected mime type: %r' % mime_type)
+ logging.debug('Detected mime type: %r', mime_type)
language_manager = gtksourceview2.language_manager_get_default()
detected_language = None
@@ -450,7 +450,7 @@ class SourceDisplay(gtk.ScrolledWindow):
break
if detected_language is not None:
- logging.debug('Detected language: %r' % \
+ logging.debug('Detected language: %r',
detected_language.get_name())
self._buffer.set_language(detected_language)