on the way of making the XMLRPC tracker a standalone app. Away from sfiprocess in...

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 1e93b29..92c420b 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -5,7 +5,6 @@ import time
 
 from PyQt4.QtCore import *
 from sface.config import config
 
 from PyQt4.QtCore import *
 from sface.config import config

-from sface.xmlrpcwindow import XmlrpcTracker

 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""


@@ -25,11 +24,6 @@ class SfiProcess(QObject):
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
         
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
         

-        self.xmlrpctracker = XmlrpcTracker()
-        # in case self.output is read by the XmlrpcTracker before any
-        # readyReadStandardOutput signal
-        self.output = ''
-

         self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
                      self.processStandardOutput)
         self.connect(self.process, SIGNAL("readyReadStandardError()"),
         self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
                      self.processStandardOutput)
         self.connect(self.process, SIGNAL("readyReadStandardError()"),


@@ -37,9 +31,6 @@ class SfiProcess(QObject):
 
     def __init_command(self, args):
         self.args = QStringList()
 
     def __init_command(self, args):
         self.args = QStringList()

-        if config.debug:
-            # this shows xmlrpc conversation, see sfi.py docs.
-            self.args << QString('-D')

         for arg in args:
             self.args << QString(arg)
 
         for arg in args:
             self.args << QString(arg)
 


@@ -54,12 +45,8 @@ class SfiProcess(QObject):
         # NOTE: The signal readyReadStandardOutput is emitted when
         # the process has made new data available through its standard output channel.
         # But the process is not necessarily finished.
         # NOTE: The signal readyReadStandardOutput is emitted when
         # the process has made new data available through its standard output channel.
         # But the process is not necessarily finished.

-        # It's cool to have this method wo we print the stdOut live,
-        # but we must be carefull with self.output, used by XmlrpcTracker too.
-        tmpOut = self.process.readAllStandardOutput()

         if config.debug:
         if config.debug:

-            print tmpOut        
-        self.output += tmpOut
+            print self.process.readAllStandardOutput()

 
     def processStandardError(self):
         print self.process.readAllStandardError()
 
     def processStandardError(self):
         print self.process.readAllStandardError()


@@ -140,5 +127,4 @@ class SfiProcess(QObject):
         if config.verbose:
             command = "%s %s" % (self.exe, self.args.join(" "))
             print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
         if config.verbose:
             command = "%s %s" % (self.exe, self.args.join(" "))
             print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'

-            self.xmlrpctracker.getAndPrint(self.output)