Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <silbe@activitycentral.com>2011-05-21 12:20:28 (GMT)
committer Sascha Silbe <silbe@activitycentral.com>2011-05-21 12:34:48 (GMT)
commit93ec9dba8f98ad669d14f5aaed1879ab71c96287 (patch)
treee01970f22c24372407e64cd49443f5e8c3f9c502
parent14da529ec77941a93ed3066ed02a10113ffe31d5 (diff)
Logger style fixes
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
-rw-r--r--downloadmanager.py16
-rw-r--r--filepicker.py6
-rw-r--r--messenger.py22
-rw-r--r--sessionhistory.py12
-rw-r--r--sessionstore.py4
-rw-r--r--webactivity.py29
6 files changed, 45 insertions, 44 deletions
diff --git a/downloadmanager.py b/downloadmanager.py
index a71f16e..ec18973 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -142,14 +142,14 @@ class Download:
del _dest_to_window[file_path]
view = hulahop.get_view_for_window(dom_window)
- logging.debug('Download.init dom_window: %r' % dom_window)
+ logging.debug('Download.init dom_window: %r', dom_window)
self._activity = view.get_toplevel()
return NS_OK
def onStatusChange(self, web_progress, request, status, message):
- logging.info('Download.onStatusChange(%r, %r, %r, %r)' % \
- (web_progress, request, status, message))
+ logging.info('Download.onStatusChange(%r, %r, %r, %r)',
+ web_progress, request, status, message)
def onStateChange(self, web_progress, request, state_flags, status):
if state_flags & interfaces.nsIWebProgressListener.STATE_START:
@@ -254,8 +254,8 @@ class Download:
try:
self.datastore_deleted_handler.remove()
datastore.delete(self._object_id)
- except Exception, e:
- logging.warning('Object has been deleted already %s' % e)
+ except Exception:
+ logging.exception('Object has been deleted already')
if self.dl_jobject is not None:
self.cleanup_datastore_write()
if self._stop_alert is not None:
@@ -283,7 +283,7 @@ class Download:
self.cleanup_datastore_write()
def _internal_save_error_cb(self, err):
- logging.debug("Error saving activity object to datastore: %s" % err)
+ logging.error('Error saving activity object to datastore: %s', err)
self.cleanup_datastore_write()
def onProgressChange64(self, web_progress, request, cur_self_progress,
@@ -340,8 +340,8 @@ class Download:
arg0=self.dl_jobject.object_id)
def __datastore_deleted_cb(self, uid):
- logging.debug('Downloaded entry has been deleted from the datastore: %r'
- % uid)
+ logging.debug('Downloaded entry has been deleted from the data'
+ ' store: %r', uid)
global _active_downloads
if self in _active_downloads:
# TODO: Use NS_BINDING_ABORTED instead of NS_ERROR_FAILURE.
diff --git a/filepicker.py b/filepicker.py
index ae5b4f1..5cfc889 100644
--- a/filepicker.py
+++ b/filepicker.py
@@ -41,8 +41,8 @@ def cleanup_temp_files():
if os.path.isdir(temp_dir):
shutil.rmtree(temp_dir, ignore_errors=True)
else:
- logging.debug('filepicker.cleanup_temp_files: no file %r'
- % temp_dir)
+ logging.debug('filepicker.cleanup_temp_files: no file %r',
+ temp_dir)
class FilePicker:
@@ -131,7 +131,7 @@ class FilePicker:
return None
def get_file(self):
- logging.debug('FilePicker.get_file: %r' % self._file)
+ logging.debug('FilePicker.get_file: %r', self._file)
if self._file:
cls = components.classes["@mozilla.org/file/local;1"]
local_file = cls.createInstance(interfaces.nsILocalFile)
diff --git a/messenger.py b/messenger.py
index 5114511..4628afa 100644
--- a/messenger.py
+++ b/messenger.py
@@ -41,11 +41,11 @@ class Messenger(ExportedGObject):
self.tube.watch_participants(self.participant_change_cb)
def participant_change_cb(self, added, removed):
- _logger.debug('Participants change add=%s rem=%s'
- %(added, removed))
+ _logger.debug('Participants change add=%s rem=%s',
+ added, removed)
for handle, bus_name in added:
- _logger.debug('Add member handle=%s bus_name=%s'
- %(str(handle), str(bus_name)))
+ _logger.debug('Add member handle=%s bus_name=%s',
+ handle, bus_name)
self.members.append(bus_name)
for handle in removed:
@@ -62,14 +62,14 @@ class Messenger(ExportedGObject):
byte_arrays=True)
self.bus_name = self.tube.get_unique_name()
if self.is_initiator:
- _logger.debug('Initialising a new shared browser, I am %s .'
- %self.tube.get_unique_name())
+ _logger.debug('Initialising a new shared browser, I am %s .',
+ self.tube.get_unique_name())
else:
# sync with other members
- _logger.debug('Joined I am %s .'%self.bus_name)
+ _logger.debug('Joined I am %s .', self.bus_name)
for member in self.members:
if member != self.bus_name:
- _logger.debug('Get info from %s' %member)
+ _logger.debug('Get info from %s', member)
self.tube.get_object(member, PATH).sync_with_members(
self.model.get_links_ids(), dbus_interface=IFACE,
reply_handler=self.reply_sync, error_handler=lambda
@@ -86,7 +86,7 @@ class Messenger(ExportedGObject):
link['owner'], link['thumb'], link['timestamp'])
def error_sync(self, e, when):
- _logger.error('Error %s: %s'%(when, e))
+ _logger.error('Error %s: %s', when, e)
@dbus.service.method(dbus_interface=IFACE, in_signature='as',
out_signature='ass', sender_keyword='sender')
@@ -116,7 +116,7 @@ class Messenger(ExportedGObject):
@dbus.service.signal(IFACE, signature='sssssd')
def _add_link(self, url, title, color, owner, thumb, timestamp):
'''Signal to send the link information (add)'''
- _logger.debug('Add Link: %s '%url)
+ _logger.debug('Add Link: %s ', url)
def _add_link_receiver(self, url, title, color, owner, buf, timestamp,
sender=None):
@@ -125,4 +125,4 @@ class Messenger(ExportedGObject):
if self.tube.self_handle != handle:
thumb = base64.b64decode(buf)
self.model.add_link(url, title, thumb, owner, color, timestamp)
- _logger.debug('Added link: %s to linkbar.'%(url))
+ _logger.debug('Added link: %s to linkbar.', url)
diff --git a/sessionhistory.py b/sessionhistory.py
index 8a5aef0..be4ab93 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -44,34 +44,34 @@ class HistoryListener(gobject.GObject):
self._session_history.addSHistoryListener(self._wrapped_self)
def OnHistoryGoBack(self, back_uri):
- logging.debug("OnHistoryGoBack: %s" % back_uri.spec)
+ logging.debug('OnHistoryGoBack: %s', back_uri.spec)
self.emit('session-link-changed', back_uri.spec)
self.emit('session-history-changed', self._session_history.index - 1)
return True
def OnHistoryGoForward(self, forward_uri):
- logging.debug("OnHistoryGoForward: %s" % forward_uri.spec)
+ logging.debug('OnHistoryGoForward: %s', forward_uri.spec)
self.emit('session-link-changed', forward_uri.spec)
self.emit('session-history-changed', self._session_history.index + 1)
return True
def OnHistoryGotoIndex(self, index, goto_uri):
- logging.debug("OnHistoryGotoIndex: %i %s" % (index, goto_uri.spec))
+ logging.debug('OnHistoryGotoIndex: %i %s', index, goto_uri.spec)
self.emit('session-link-changed', goto_uri.spec)
self.emit('session-history-changed', index)
return True
def OnHistoryNewEntry(self, new_uri):
- logging.debug("OnHistoryNewEntry: %s" % new_uri.spec)
+ logging.debug('OnHistoryNewEntry: %s', new_uri.spec)
self.emit('session-link-changed', new_uri.spec)
self.emit('session-history-changed', self._session_history.index + 1)
def OnHistoryPurge(self, num_entries):
- logging.debug("OnHistoryPurge: %i" % num_entries)
+ logging.debug('OnHistoryPurge: %i', num_entries)
#self.emit('session-history-changed')
return True
def OnHistoryReload(self, reload_uri, reload_flags):
self.emit('session-link-changed', reload_uri.spec)
- logging.debug("OnHistoryReload: %s" % reload_uri.spec)
+ logging.debug('OnHistoryReload: %s', reload_uri.spec)
return True
diff --git a/sessionstore.py b/sessionstore.py
index e09c3a1..73edb24 100644
--- a/sessionstore.py
+++ b/sessionstore.py
@@ -41,7 +41,7 @@ def set_session(browser, data):
def _get_history(history):
- logging.debug('%r' % history.count)
+ logging.debug('%r', history.count)
entries_dest = []
for i in range(0, history.count):
entry_orig = history.getEntryAtIndex(i, False)
@@ -60,7 +60,7 @@ def _set_history(history, history_data):
history_internal.purgeHistory(history_internal.count)
for entry_dict in history_data:
- logging.debug('entry_dict: %r' % entry_dict)
+ logging.debug('entry_dict: %r', entry_dict)
entry_class = components.classes[ \
"@mozilla.org/browser/session-history-entry;1"]
entry = entry_class.createInstance(interfaces.nsISHEntry)
diff --git a/webactivity.py b/webactivity.py
index 480ea9a..8415df2 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -123,8 +123,8 @@ def _seed_xs_cookie():
'/', expire, 0, 0, 0))
cookies_db.commit()
cookies_db.close()
- except sqlite3.Error, e:
- _logger.error('seed_xs_cookie: %s' % e)
+ except sqlite3.Error:
+ _logger.exception('seed_xs_cookie: could not write cookie')
else:
_logger.debug('seed_xs_cookie: Updated cookie successfully')
@@ -265,7 +265,7 @@ class WebActivity(activity.Activity):
self.initiating = None
if self._shared_activity is not None:
- _logger.debug('shared: %s' %self._shared_activity.props.joined)
+ _logger.debug('shared: %s', self._shared_activity.props.joined)
if self._shared_activity is not None:
# We are joining the activity
@@ -304,15 +304,16 @@ class WebActivity(activity.Activity):
channel = telepathy.client.Channel(bus_name, channel_path)
htype, handle = channel.GetHandle()
if htype == telepathy.HANDLE_TYPE_ROOM:
- _logger.debug('Found our room: it has handle#%d "%s"'
- %(handle, self.conn.InspectHandles(htype, [handle])[0]))
+ _logger.debug('Found our room: it has handle#%d "%s"',
+ handle,
+ self.conn.InspectHandles(htype, [handle])[0])
room = handle
ctype = channel.GetChannelType()
if ctype == telepathy.CHANNEL_TYPE_TUBES:
- _logger.debug('Found our Tubes channel at %s'%channel_path)
+ _logger.debug('Found our Tubes channel at %s', channel_path)
tubes_chan = channel
elif ctype == telepathy.CHANNEL_TYPE_TEXT:
- _logger.debug('Found our Text channel at %s'%channel_path)
+ _logger.debug('Found our Text channel at %s', channel_path)
text_chan = channel
if room is None:
@@ -340,7 +341,7 @@ class WebActivity(activity.Activity):
self._new_tube_cb(*tube_info)
def _list_tubes_error_cb(self, e):
- _logger.debug('ListTubes() failed: %s'%e)
+ _logger.debug('ListTubes() failed: %s', e)
def _joined_cb(self, activity_):
if not self._shared_activity:
@@ -358,8 +359,8 @@ class WebActivity(activity.Activity):
def _new_tube_cb(self, identifier, initiator, type, service, params, state):
_logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
- 'params=%r state=%d' %(identifier, initiator, type,
- service, params, state))
+ 'params=%r state=%d', identifier, initiator, type,
+ service, params, state)
if (type == telepathy.TUBE_TYPE_DBUS and
service == SERVICE):
@@ -412,7 +413,7 @@ class WebActivity(activity.Activity):
base64.b64decode(link['thumb']),
link['color'], link['title'],
link['owner'], -1, link['hash'])
- logging.debug('########## reading %s' % data)
+ logging.debug('########## reading %s', data)
self._tabbed_view.set_session(self.model.data['history'])
self._tabbed_view.set_current_page(self.model.data['current_tab'])
elif self.metadata['mime_type'] == 'text/uri-list':
@@ -463,7 +464,7 @@ class WebActivity(activity.Activity):
f = open(file_path, 'w')
try:
- logging.debug('########## writing %s' % self.model.serialize())
+ logging.debug('########## writing %s', self.model.serialize())
f.write(self.model.serialize())
finally:
f.close()
@@ -520,8 +521,8 @@ class WebActivity(activity.Activity):
for link in self.model.data['shared_links']:
if link['hash'] == sha1(ui_uri).hexdigest():
- _logger.debug('_add_link: link exist already a=%s b=%s' %(
- link['hash'], sha1(ui_uri).hexdigest()))
+ _logger.debug('_add_link: link exist already a=%s b=%s',
+ link['hash'], sha1(ui_uri).hexdigest())
return
buf = self._get_screenshot()
timestamp = time.time()