attachment:xapian.patch von Admin/Patches

   1 # HG changeset patch
   2 # User Thomas Waldmann <tw AT waldmann-edv DOT de>
   3 # Date 1263941977 -3600
   4 # Node ID 3e6b8234861cbbbec3028552eff2c888ad669882
   5 # Parent  9652b2e16a10611478fdb1215bffcc43d56be60f
   6 partially revert 0dd02729b3b5 (self.timeout related changes caused AttributeError)
   7 
   8 --- a/MoinMoin/util/SubProcess.py	Tue Jan 19 00:46:31 2010 +0100
   9 +++ b/MoinMoin/util/SubProcess.py	Tue Jan 19 23:59:37 2010 +0100
  10 @@ -67,6 +67,8 @@
  11  
  12          communicate() returns a tuple (stdout, stderr)."""
  13  
  14 +        self.timeout = timeout
  15 +
  16          # Optimization: If we are only using one pipe, or no pipe at
  17          # all, using select() or threads is unnecessary.
  18          if [self.stdin, self.stdout, self.stderr].count(None) >= 2:
  19 @@ -111,9 +113,9 @@
  20                  self.stdin.close()
  21  
  22              if self.stdout:
  23 -                stdout_thread.join(timeout)
  24 +                stdout_thread.join(self.timeout)
  25              if self.stderr:
  26 -                stderr_thread.join(timeout)
  27 +                stderr_thread.join(self.timeout)
  28  
  29              # if the threads are still alive, that means the thread join timed out
  30              timed_out = (self.stdout and stdout_thread.isAlive() or
  31 @@ -167,7 +169,7 @@
  32              input_offset = 0
  33              while read_set or write_set:
  34                  try:
  35 -                    rlist, wlist, xlist = select.select(read_set, write_set, [], timeout)
  36 +                    rlist, wlist, xlist = select.select(read_set, write_set, [], self.timeout)
  37                  except select.error, e:
  38                      if e.args[0] == errno.EINTR:
  39                          continue