Blame SOURCES/python-urwid-test_vterm-EINTR.patch
|
 |
d80ad1 |
commit f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3
|
|
|
d80ad1 |
Author: Mike Gilbert <floppym@gentoo.org>
|
|
|
d80ad1 |
Date: Sat Jun 3 14:53:51 2017 -0400
|
|
|
d80ad1 |
|
|
|
d80ad1 |
test_vterm: handle EINTR when reading from pipe
|
|
|
d80ad1 |
|
|
|
d80ad1 |
Fixes: https://github.com/urwid/urwid/issues/230
|
|
|
d80ad1 |
|
|
|
d80ad1 |
diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
|
|
|
d80ad1 |
index 4dadfcc..075c653 100644
|
|
|
d80ad1 |
--- a/urwid/tests/test_vterm.py
|
|
|
d80ad1 |
+++ b/urwid/tests/test_vterm.py
|
|
|
d80ad1 |
@@ -18,6 +18,7 @@
|
|
|
d80ad1 |
#
|
|
|
d80ad1 |
# Urwid web site: http://excess.org/urwid/
|
|
|
d80ad1 |
|
|
|
d80ad1 |
+import errno
|
|
|
d80ad1 |
import os
|
|
|
d80ad1 |
import sys
|
|
|
d80ad1 |
import unittest
|
|
|
d80ad1 |
@@ -28,7 +29,6 @@ from urwid import vterm
|
|
|
d80ad1 |
from urwid import signals
|
|
|
d80ad1 |
from urwid.compat import B
|
|
|
d80ad1 |
|
|
|
d80ad1 |
-
|
|
|
d80ad1 |
class DummyCommand(object):
|
|
|
d80ad1 |
QUITSTRING = B('|||quit|||')
|
|
|
d80ad1 |
|
|
|
d80ad1 |
@@ -41,12 +41,20 @@ class DummyCommand(object):
|
|
|
d80ad1 |
stdout.write(B('\x1bc'))
|
|
|
d80ad1 |
|
|
|
d80ad1 |
while True:
|
|
|
d80ad1 |
- data = os.read(self.reader, 1024)
|
|
|
d80ad1 |
+ data = self.read(1024)
|
|
|
d80ad1 |
if self.QUITSTRING == data:
|
|
|
d80ad1 |
break
|
|
|
d80ad1 |
stdout.write(data)
|
|
|
d80ad1 |
stdout.flush()
|
|
|
d80ad1 |
|
|
|
d80ad1 |
+ def read(self, size):
|
|
|
d80ad1 |
+ while True:
|
|
|
d80ad1 |
+ try:
|
|
|
d80ad1 |
+ return os.read(self.reader, size)
|
|
|
d80ad1 |
+ except OSError as e:
|
|
|
d80ad1 |
+ if e.errno != errno.EINTR:
|
|
|
d80ad1 |
+ raise
|
|
|
d80ad1 |
+
|
|
|
d80ad1 |
def write(self, data):
|
|
|
d80ad1 |
os.write(self.writer, data)
|