[commit-gajim] r8335 - trunk/src/common - Commits

28 Jun 2007

Author: liori
Date: 2007-06-28 10:14:25 +0200 (Thu, 28 Jun 2007)
New Revision: 8335
Modified:
   trunk/src/common/caps.py
Log:
xmpppy doesn't raise exceptions!
Modified: trunk/src/common/caps.py
===================================================================

--- trunk/src/common/caps.py	2007-06-27 23:26:07 UTC (rev 8334)
+++ trunk/src/common/caps.py	2007-06-28 08:14:25 UTC (rev 8335)
@@ -225,15 +225,14 @@
    	caps=presence.getTag('c')
    	if not caps: return
-		try:
-			node, ver=caps['node'], caps['ver']
-		except KeyError:
+		node, ver=caps['node'], caps['ver']
+		if node is None or ver is None:
    		# improper caps in stanza, ignoring
    		return
try:
    		exts=caps['ext'].split(' ')
-		except KeyError:
+		except AttributeError:
    		# no exts means no exts, a perfectly valid case
    		exts=[]

    