diff options
Diffstat (limited to 'src/jarabe/view')
-rw-r--r-- | src/jarabe/view/keyhandler.py | 8 | ||||
-rw-r--r-- | src/jarabe/view/launcher.py | 2 | ||||
-rw-r--r-- | src/jarabe/view/palettes.py | 2 | ||||
-rw-r--r-- | src/jarabe/view/viewsource.py | 12 |
4 files changed, 12 insertions, 12 deletions
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) |