X-Git-Url: https://git.ucc.asn.au/?p=progcomp10.git;a=blobdiff_plain;f=src%2Flink%2FexternAgent.py;fp=src%2Flink%2FexternAgent.py;h=e75827c615a9239197e24dcb5345755ca10753b6;hp=10118c1d5f53fbb21884f2bed1ad206a5ee52de8;hb=35ff18a5beda685e59ca898026570d67b7ead333;hpb=e4184557ebc33201e217e167d577128f710e4890

diff --git a/src/link/externAgent.py b/src/link/externAgent.py
index 10118c1..e75827c 100644
--- a/src/link/externAgent.py
+++ b/src/link/externAgent.py
@@ -41,7 +41,7 @@ class externAgent (BaseAgent):
         
     def Attack (self, foe):
         self.process.sendline( "ATTACK %s" % foe )
-        self.process.expect( "ATTACKING (.+) (.+)\n" )
+        self.process.expect( "ATTACKING (.+) (.+)\r\n" )
         attack, bluff = self.process.match.groups()
         attack, bluff = attack.strip(), bluff.strip()
         return self.stringToItem(attack), self.stringToItem(bluff)
@@ -49,8 +49,10 @@ class externAgent (BaseAgent):
     def Defend( self, foe, bluff ):
         #print "DEFEND %s %s" % (foe, self.itemToString(bluff))
         self.process.sendline( "DEFEND %s %s" % (foe, self.itemToString(bluff) ) )
-        self.process.expect( "DEFENDING (.+)" )
+        self.process.expect( "DEFENDING (.+)\r\n" )
         #print '------------------ ', self.process.match.groups()[0].strip()
         defence = self.process.match.groups()[0].strip()
         return self.stringToItem(defence)
-        
\ No newline at end of file
+        
+    def __del__(self):
+        self.process.close(True)