equal
deleted
inserted
replaced
122 self.startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW |
122 self.startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW |
123 popenargs["startupinfo"] = self.startupinfo |
123 popenargs["startupinfo"] = self.startupinfo |
124 elif wx.Platform == '__WXGTK__': |
124 elif wx.Platform == '__WXGTK__': |
125 popenargs["shell"] = False |
125 popenargs["shell"] = False |
126 |
126 |
|
127 if timeout: |
|
128 self.timeout = Timer(timeout,self.endlog) |
|
129 self.timeout.start() |
|
130 else: |
|
131 self.timeout = None |
|
132 |
127 self.Proc = subprocess.Popen( self.Command, **popenargs ) |
133 self.Proc = subprocess.Popen( self.Command, **popenargs ) |
128 |
134 |
129 self.outt = outputThread( |
135 self.outt = outputThread( |
130 self.Proc, |
136 self.Proc, |
131 self.Proc.stdout, |
137 self.Proc.stdout, |
137 self.Proc, |
143 self.Proc, |
138 self.Proc.stderr, |
144 self.Proc.stderr, |
139 self.errors) |
145 self.errors) |
140 self.errt.start() |
146 self.errt.start() |
141 |
147 |
142 if timeout: |
|
143 self.timeout = Timer(timeout,self.endlog) |
|
144 self.timeout.start() |
|
145 else: |
|
146 self.timeout = None |
|
147 |
148 |
148 def output(self,v): |
149 def output(self,v): |
149 self.outdata.append(v) |
150 self.outdata.append(v) |
150 self.outlen += 1 |
151 self.outlen += 1 |
151 if not self.no_stdout: |
152 if not self.no_stdout: |