summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-06-03 15:08:17 -0400
committerMike Gilbert <floppym@gentoo.org>2017-06-03 15:09:18 -0400
commit49e1d7c69020a0efd717a550f0d54d4f584ec3c5 (patch)
tree60a7909aae33e2e478bebd484d46c357a7e032ba /dev-python/urwid/files
parentmedia-sound/kid3: Set KDE_HANDBOOK=false (diff)
downloadgentoo-49e1d7c69020a0efd717a550f0d54d4f584ec3c5.tar.gz
gentoo-49e1d7c69020a0efd717a550f0d54d4f584ec3c5.tar.bz2
gentoo-49e1d7c69020a0efd717a550f0d54d4f584ec3c5.zip
dev-python/urwid: handle EINTR in test_vterm
Bug: https://bugs.gentoo.org/593738 Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69
Diffstat (limited to 'dev-python/urwid/files')
-rw-r--r--dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
new file mode 100644
index 000000000000..04b6e2c949c4
--- /dev/null
+++ b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
@@ -0,0 +1,52 @@
+From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 3 Jun 2017 14:53:51 -0400
+Subject: [PATCH] test_vterm: handle EINTR when reading from pipe
+
+Fixes: https://github.com/urwid/urwid/issues/230
+---
+ urwid/tests/test_vterm.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
+index 4dadfcc..075c653 100644
+--- a/urwid/tests/test_vterm.py
++++ b/urwid/tests/test_vterm.py
+@@ -18,6 +18,7 @@
+ #
+ # Urwid web site: http://excess.org/urwid/
+
++import errno
+ import os
+ import sys
+ import unittest
+@@ -28,7 +29,6 @@
+ from urwid import signals
+ from urwid.compat import B
+
+-
+ class DummyCommand(object):
+ QUITSTRING = B('|||quit|||')
+
+@@ -41,12 +41,20 @@ def __call__(self):
+ stdout.write(B('\x1bc'))
+
+ while True:
+- data = os.read(self.reader, 1024)
++ data = self.read(1024)
+ if self.QUITSTRING == data:
+ break
+ stdout.write(data)
+ stdout.flush()
+
++ def read(self, size):
++ while True:
++ try:
++ return os.read(self.reader, size)
++ except OSError as e:
++ if e.errno != errno.EINTR:
++ raise
++
+ def write(self, data):
+ os.write(self.writer, data)
+