Changeset 56205

Timestamp:

10/09/08 19:27:14 (6 weeks ago)

Author:

CJP

Message:

Fix some issues with killing processes, some minor updates to the test/demo.

Location:

wxPython/3rdParty/Editra

Files:

• src/eclib/outbuff.py (modified) (9 diffs)
• tests/controls/OutputBufferDemo.py (modified) (2 diffs)

wxPython/3rdParty/Editra/src/eclib/outbuff.py

@@ -190 +190 @@
         self.SetMarginWidth(1, 0)
 
+        # To improve performance at cost of memory cache the document layout
         self.SetLayoutCache(wx.stc.STC_CACHE_DOCUMENT)
         self.SetUndoCollection(False) # Don't keep undo history
@@ -262 +263 @@
     def AppendUpdate(self, value):
         """Buffer output before adding to window. This method can safely be
-        called from non gui threads to add updates to the buffer.
+        called from non gui threads to add updates to the buffer, that will
+        be displayed durning the next idle period.
         @param value: update string to append to stack
 
@@ -642 +644 @@
                 if msg[0] in (109, errno.ESHUTDOWN):
                     return False
-
         else:
             # OSX and Unix nonblocking pipe read implementation
@@ -652 +653 @@
                 fcntl.fcntl(self._proc.stdout,
                             fcntl.F_SETFL,
-                            flags| os.O_NONBLOCK)
+                            flags|os.O_NONBLOCK)
 
             try:
-                if not select.select([self._proc.stdout], [], [], 1)[0]:
-                    return True
-
-                read = self._proc.stdout.readline()
-                if read == '':
+                try:
+                    if not select.select([self._proc.stdout], [], [], 1)[0]:
+                        return True
+
+                    read = self._proc.stdout.readline()
+                    if read == '':
+                        return False
+                except IOError:
                     return False
             finally:
@@ -672 +676 @@
 
         evt = OutputBufferEvent(edEVT_UPDATE_TEXT, self._parent.GetId(), result)
-        wx.CallAfter(wx.PostEvent, self._parent, evt)
+        wx.PostEvent(self._parent, evt)
         return True
 
@@ -697 +701 @@
             # Try to kill the group
             try:
-                pgid = os.getpgid(pid)
-                os.killpg(pgid, signal.SIGKILL)
+                os.kill(pid, signal.SIGKILL)
             except OSError, msg:
                 pass
 
             # If still alive shoot it again
-            if self._proc.poll() != None:
+            if self._proc.poll() is not None:
                 try:
                     os.kill(-pid, signal.SIGKILL)
@@ -711 +714 @@
             # Try and wait for it to cleanup
             try:
-                os.waitpid(-pid, os.WNOHANG)
+                os.waitpid(pid, os.WNOHANG)
             except OSError, msg:
                 pass
@@ -738 +741 @@
 
         use_shell = not subprocess.mswindows
-        if use_shell:
-            preexec_fn = os.setsid
-        else:
-            preexec_fn = None
-
-        self._proc = subprocess.Popen(command.strip(), stdout=subprocess.PIPE,
-                                      preexec_fn=preexec_fn,
-                                      stderr=subprocess.STDOUT, shell=use_shell,
-                                      cwd=self._cwd, env=self._env)
+        self._proc = subprocess.Popen(command.strip(),
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.STDOUT,
+                                      shell=use_shell,
+                                      cwd=self._cwd,
+                                      env=self._env)
 
         evt = OutputBufferEvent(edEVT_PROCESS_START,
                                 self._parent.GetId(),
                                 command.strip())
-        wx.CallAfter(wx.PostEvent, self._parent, evt)
+        wx.PostEvent(self._parent, evt)
 
         # Read from stdout while there is output from process
@@ -780 +780 @@
         # Pack the exit code as the events value
         evt = OutputBufferEvent(edEVT_PROCESS_EXIT, self._parent.GetId(), result)
-        wx.CallAfter(wx.PostEvent, self._parent, evt)
+        wx.PostEvent(self._parent, evt)
 
     def SetArgs(self, args):

wxPython/3rdParty/Editra/tests/controls/OutputBufferDemo.py

@@ -105 +105 @@
             # Spawn a new ProcessThread
             combo = self.FindWindowById(ID_COMMAND)
-            self._buff.StartProcess('%s' % combo.GetValue())
+            self._buff.StartProcess(u'%s' % combo.GetValue())
             self.UpdateProcs()
         else:
@@ -287 +287 @@
         frame.SetSizer(sizer)
         frame.SetInitialSize()
-        frame.SetStatusText("OutputBuffer test")
+        frame.SetStatusText("OutputBufferDemo: wxPython %s, Python %s" % \
+                            (wx.__version__, u".".join(str(x) for x in sys.version_info)))
         frame.Show()
         app.MainLoop()