equal
deleted
inserted
replaced
44 self.callback = callback |
44 self.callback = callback |
45 self.endcallback = endcallback |
45 self.endcallback = endcallback |
46 self.fd = fd |
46 self.fd = fd |
47 |
47 |
48 def run(self): |
48 def run(self): |
|
49 outchunk = None |
49 self.retval = None |
50 self.retval = None |
|
51 while outchunk != '' and not self.killed : |
|
52 outchunk = self.fd.readline() |
|
53 if self.callback : self.callback(outchunk) |
50 while self.retval is None and not self.killed : |
54 while self.retval is None and not self.killed : |
51 self.retval = self.Proc.poll() |
55 self.retval = self.Proc.poll() |
52 outchunk = self.fd.readline() |
56 outchunk = self.fd.readline() |
53 #if outchunk == '': |
57 if self.callback : self.callback(outchunk) |
54 # break |
58 while outchunk != '' and not self.killed : |
55 if self.callback : |
59 outchunk = self.fd.readline() |
56 self.callback(outchunk) |
|
57 if self.endcallback: |
60 if self.endcallback: |
58 try: |
61 try: |
59 err = self.Proc.wait() |
62 err = self.Proc.wait() |
60 except: |
63 except: |
61 err = self.retval |
64 err = self.retval |