diff options
Diffstat (limited to 'src/jarabe/model')
| -rw-r--r-- | src/jarabe/model/bundleregistry.py | 10 | ||||
| -rw-r--r-- | src/jarabe/model/filetransfer.py | 20 | ||||
| -rw-r--r-- | src/jarabe/model/friends.py | 8 | ||||
| -rw-r--r-- | src/jarabe/model/neighborhood.py | 10 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 30 | ||||
| -rw-r--r-- | src/jarabe/model/notifications.py | 4 | ||||
| -rw-r--r-- | src/jarabe/model/shell.py | 22 |
7 files changed, 51 insertions, 53 deletions
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 |