diff options
Diffstat (limited to 'src/jarabe/desktop')
| -rw-r--r-- | src/jarabe/desktop/favoriteslayout.py | 6 | ||||
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 6 | ||||
| -rw-r--r-- | src/jarabe/desktop/homebox.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 2 | ||||
| -rw-r--r-- | src/jarabe/desktop/schoolserver.py | 6 |
5 files changed, 12 insertions, 12 deletions
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.')) |