mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 23:08:09 -07:00
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
This commit is contained in:
52
dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
Normal file
52
dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
Normal file
@@ -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)
|
||||
|
||||
@@ -22,7 +22,10 @@ DEPEND="
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.1.0-sphinx.patch
|
||||
"${FILESDIR}"/urwid-1.3.1-test-vterm-EINTR.patch
|
||||
)
|
||||
|
||||
python_compile_all() {
|
||||
if use doc ; then
|
||||
|
||||
Reference in New Issue
Block a user