[kupfer] firefox: Use output_exc



commit 54fa2ad1f9ccd2d87297e9c9f0e76074d9ce841d
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Feb 15 15:58:25 2010 +0100

    firefox: Use output_exc

 kupfer/plugin/firefox.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/kupfer/plugin/firefox.py b/kupfer/plugin/firefox.py
index 841e89b..ae1307b 100644
--- a/kupfer/plugin/firefox.py
+++ b/kupfer/plugin/firefox.py
@@ -54,9 +54,9 @@ class BookmarksSource (AppLeafContentMixin, Source, FilesystemWatchMixin):
 				             LIMIT ?""",
 				             (max_history_items,))
 				return [UrlLeaf(url, title) for url, title in c]
-		except sqlite3.Error, exc:
+		except sqlite3.Error:
 			# Something is wrong with the database
-			self.output_error(exc)
+			self.output_exc()
 
 	def _get_ffx3_bookmarks(self, fpath):
 		"""Parse Firefox' .json bookmarks backups"""
@@ -92,10 +92,10 @@ class BookmarksSource (AppLeafContentMixin, Source, FilesystemWatchMixin):
 		if fpath and os.path.splitext(fpath)[-1].lower() == ".json":
 			try:
 				json_bookmarks = list(self._get_ffx3_bookmarks(fpath))
-			except Exception, exc:
+			except Exception:
 				# Catch JSON parse errors
 				# different exception for cjson and json
-				self.output_error(exc)
+				self.output_exc()
 			else:
 				return itertools.chain(self._history, json_bookmarks)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]