Merge lp:~ken-vandine/friends/unsupported_handling into lp:friends

[Ken VanDine]

Gracefully fail to load accounts for unsupported protocols

=== modified file 'friends/tests/test_account.py'
--- friends/tests/test_account.py	2012-10-13 22:14:25 +0000
+++ friends/tests/test_account.py	2012-10-17 16:29:24 +0000
@@ -195,6 +195,15 @@
         manager.add_new_account(self.account_service)
         self.assertIn('faker/than fake', manager._accounts)
 
+    def test_account_manager_add_new_account_unsupported(self):
+        mock = self.account_service.get_account()
+        mock.get_provider_name.return_value = 'no service'
+        def refresh():
+            pass
+        manager = AccountManager(refresh)
+        manager.add_new_account(mock.account_service)
+        self.assertNotIn('no service', manager._accounts)
+
     def test_account_manager_enabled_event(self):
         # Mimic a reaction to the enabled-event callback.
         refreshed = False

=== modified file 'friends/utils/account.py'
--- friends/utils/account.py	2012-10-13 22:14:25 +0000
+++ friends/utils/account.py	2012-10-17 16:29:24 +0000
@@ -79,8 +79,12 @@
         self._callback()
 
     def add_new_account(self, account_service):
-        new_account = Account(account_service)
-        self._accounts[new_account.id] = new_account
+        try:
+            new_account = Account(account_service)
+            self._accounts[new_account.id] = new_account
+        except UnsupportedProtocolError as error:
+            log.info(error)
+
 
     def get_all(self):
         return self._accounts.values()