From ee079d771182f2ccf0970aad12e15fe3f921d631 Mon Sep 17 00:00:00 2001
From: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
Date: Fri, 11 Aug 2006 15:06:30 +0000
Subject: [PATCH] Support for Twisted 2.0.1 and 2.1.0 Fixed some exceptions
 Fixed a failing test case

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@225 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
---
 src/legacy/msn/msn.py      | 19 ++++++++++++-------
 src/legacy/msn/test_msn.py |  4 ++--
 src/register.py            |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/legacy/msn/msn.py b/src/legacy/msn/msn.py
index 2bc306c..835106c 100644
--- a/src/legacy/msn/msn.py
+++ b/src/legacy/msn/msn.py
@@ -520,13 +520,18 @@ class MSNObject:
         e = parseText(s, True)
         if not e:
             return # Parse failed
-        self.creator = e.getAttribute("Creator")
-        self.size = int(e.getAttribute("Size"))
-        self.type = int(e.getAttribute("Type"))
-        self.location = e.getAttribute("Location")
-        self.friendly = e.getAttribute("Friendly")
-        self.sha1d = e.getAttribute("SHA1D")
-        self.text = s
+        try:
+            self.creator = e.getAttribute("Creator")
+            self.size = int(e.getAttribute("Size"))
+            self.type = int(e.getAttribute("Type"))
+            self.location = e.getAttribute("Location")
+            self.friendly = e.getAttribute("Friendly")
+            self.sha1d = e.getAttribute("SHA1D")
+            self.text = s
+        except TypeError:
+            self.setNull()
+        except ValueError:
+            self.setNull()
 
 
 class MSNContact:
diff --git a/src/legacy/msn/test_msn.py b/src/legacy/msn/test_msn.py
index 85b9067..ace4464 100644
--- a/src/legacy/msn/test_msn.py
+++ b/src/legacy/msn/test_msn.py
@@ -42,11 +42,11 @@ class LoopbackCon:
     def __init__(self, con1, con2):
         self.con1 = con1
         self.con2 = con2
-        self.con1ToCon2 = loopback.LoopbackRelay(con1)
-        self.con2ToCon1 = loopback.LoopbackRelay(con2)
         self.reconnect()
 
     def reconnect(self):
+        self.con1ToCon2 = loopback.LoopbackRelay(self.con1)
+        self.con2ToCon1 = loopback.LoopbackRelay(self.con2)
         self.con2.makeConnection(self.con1ToCon2)
         self.con1.makeConnection(self.con2ToCon1)
         self.connected = True
diff --git a/src/register.py b/src/register.py
index aaca74d..b15c101 100644
--- a/src/register.py
+++ b/src/register.py
@@ -134,8 +134,8 @@ class RegisterManager:
 				LogEvent(INFO, "", "Updated XDB")
 				self.successReply(incoming)
 				LogEvent(INFO, "", "Sent a result Iq")
-				(user, host, res) = internJID(incoming.getAttribute("from"))
-				jabw.sendPresence(self.pytrans, to=user + "@" + host, fro=config.jid, ptype="subscribe")
+				to = internJID(incoming.getAttribute("from")).userhost()
+				jabw.sendPresence(self.pytrans, to=to, fro=config.jid, ptype="subscribe")
 				if(config.registerMessage):
 					jabw.sendMessage(self.pytrans, to=incoming.getAttribute("from"), fro=config.jid, body=config.registerMessage)
 			except:
-- 
2.39.2