[Python-modules-commits] r19053 - in packages/urwid/trunk/debian (3 files)

[wardi-guest at users.alioth.debian.org]

    Date: Tuesday, October 25, 2011 @ 00:43:09
  Author: wardi-guest
Revision: 19053

patch for vterm.py in kfreebsd

Added:
  packages/urwid/trunk/debian/patches/002_vterm_kfreebsd_fix.patch
Modified:
  packages/urwid/trunk/debian/changelog
  packages/urwid/trunk/debian/patches/series

Modified: packages/urwid/trunk/debian/changelog
===================================================================
--- packages/urwid/trunk/debian/changelog	2011-10-24 23:37:20 UTC (rev 19052)
+++ packages/urwid/trunk/debian/changelog	2011-10-25 00:43:09 UTC (rev 19053)
@@ -1,3 +1,9 @@
+urwid (1.0.0-4) unstable; urgency=low
+
+  * patch for vterm.py in kfreebsd
+
+ -- Ian Ward <ian at excess.org>  Tue, 25 Oct 2011 00:35:22 +0000
+
 urwid (1.0.0-3) unstable; urgency=low
 
   * use quilt to apply patch

Added: packages/urwid/trunk/debian/patches/002_vterm_kfreebsd_fix.patch
===================================================================
--- packages/urwid/trunk/debian/patches/002_vterm_kfreebsd_fix.patch	                        (rev 0)
+++ packages/urwid/trunk/debian/patches/002_vterm_kfreebsd_fix.patch	2011-10-25 00:43:09 UTC (rev 19053)
@@ -0,0 +1,39 @@
+diff --git a/urwid/vterm.py b/urwid/vterm.py
+index 75a3a5c..8d82fc8 100644
+--- a/urwid/vterm.py
++++ b/urwid/vterm.py
+@@ -26,6 +26,7 @@ import pty
+ import time
+ import copy
+ import fcntl
++import errno
+ import select
+ import struct
+ import signal
+@@ -1518,15 +1519,23 @@ class Terminal(BoxWidget):
+         self.feed()
+ 
+     def feed(self):
++        data = ''
++
+         try:
+             data = os.read(self.master, 4096)
+         except OSError, e:
+             if e.errno == 5: # End Of File
+-                self.terminate()
+-                self._emit('closed')
+-            elif e.errno != 11:
++                data = ''
++            elif e.errno == errno.EWOULDBLOCK: # empty buffer
++                return
++            else:
+                 raise
++
++        if data == '': # EOF on BSD
++            self.terminate()
++            self._emit('closed')
+             return
++
+         self.term.addstr(data)
+ 
+         self.flush_responses()

Modified: packages/urwid/trunk/debian/patches/series
===================================================================
--- packages/urwid/trunk/debian/patches/series	2011-10-24 23:37:20 UTC (rev 19052)
+++ packages/urwid/trunk/debian/patches/series	2011-10-25 00:43:09 UTC (rev 19053)
@@ -1 +1,2 @@
 001_fix_event_loop_arch_build_errors.patch
+002_vterm_kfreebsd_fix.patch