diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2008-03-13 19:34:37 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2008-03-13 19:34:37 (GMT) |
| commit | 8a69fb4a1a24159a3fa39b39d59837e23d7d1fde (patch) | |
| tree | 13ee3663c96e6632cff751d4e25885ac7db15ca1 | |
| parent | 337d4ec1496de217e3bceb104912bc48dce335d7 (diff) | |
#6690: Fix sync_friends mangling the JIDs
| -rw-r--r-- | src/server_plugin.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/server_plugin.py b/src/server_plugin.py index f862ce4..c81a936 100644 --- a/src/server_plugin.py +++ b/src/server_plugin.py @@ -374,14 +374,7 @@ class ServerPlugin(TelepathyPlugin): friends_handles = set() friends = set() for key in keys: - try: - decoded = base64.b64decode(key) - except TypeError: - # key is invalid; skip this friend - _logger.debug('skipping friend with invalid key') - continue - - id = psutils.pubkey_to_keyid(decoded) + id = psutils.pubkey_to_keyid(key) # this assumes that all our friends are on the same server as us jid = '%s@%s' % (id, profile.jabber_server) friends.add(jid) |