X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fxmlrpcwindow.py;h=a368a77fec85cf503ee7f708bdca300e5107311a;hp=86c47c2e1d49f104f98f31b00f8bd7f976b34a2b;hb=dea293b69063b10026b56072ef3d1006df177d20;hpb=cb346e87aaf444b1142e80a8cec1e64df6a122cf
diff --git a/sface/xmlrpcwindow.py b/sface/xmlrpcwindow.py
index 86c47c2..a368a77 100644
--- a/sface/xmlrpcwindow.py
+++ b/sface/xmlrpcwindow.py
@@ -7,11 +7,12 @@ class XmlrpcTracker():
self.xmlrpcWindow = XmlrpcWindow()
def getAndPrint(self, rawOutput):
- print "RAW OUTPUT:\n" + rawOutput + "\nEND OF RAW OUT"
self.store(rawOutput)
self.extractXml()
self.xmlrpcWindow.setData(self.xml)
- self.showXmlrpc()
+ if self.xml != "":
+ # only popup the window if we have something to show
+ self.showXmlrpc()
def showXmlrpc(self):
self.xmlrpcWindow.show()
@@ -28,8 +29,8 @@ class XmlrpcTracker():
answers = re.compile(pttrnAsk, re.DOTALL).findall(self.rawOutput)
replies = re.compile(pttrnAns, re.DOTALL).findall(self.rawOutput)
# cleaning
- answers = map(lambda x: x.replace('\\n','\n'), answers)
- replies = map(lambda x: x.replace('\\n','\n').replace("'\nbody: '", ''), replies)
+ answers = [ x.replace('\\n','\n') for x in answers ]
+ replies = [ x.replace('\\n','\n').replace("'\nbody: '", '') for x in replies ]
replies.reverse() # so that I use pop() as popleft
# A well-formed XML document must have one, and only one, top-level element
self.xml = ''