summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Rasmus Thomsen <Rasmus.thomsen@protonmail.com> 2017-09-16 15:56:31 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-16 17:12:06 +0200
commit19bb830fadb76edadf07374126040b6080b30fc9 (patch)
tree7c747ab65a0e2d4b88633b0f7ce865cba28bd635
parent350a4d04904ddf222b99c3070c36bbc55f6730ac (diff)
downloadpython-19bb830fadb76edadf07374126040b6080b30fc9.tar.gz
python-19bb830fadb76edadf07374126040b6080b30fc9.tar.xz
dev-python/urwid: fix dependency on Twisted
also add patch to fix tests of urwid-1.3.1 Change-Id: I15eac7781f247d82dd81feec343e7b250cc2aa11 Reviewed-on: https://galileo.mailstation.de/gerrit/10069 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/dev-python/urwid/files/fix-test_vterm.patch53
-rw-r--r--packages/dev-python/urwid/urwid-1.2.2-r1.exheres-0 (renamed from packages/dev-python/urwid/urwid-1.2.2.exheres-0)0
-rw-r--r--packages/dev-python/urwid/urwid-1.3.1-r1.exheres-0 (renamed from packages/dev-python/urwid/urwid-1.3.1.exheres-0)4
-rw-r--r--packages/dev-python/urwid/urwid.exlib2
4 files changed, 58 insertions, 1 deletions
diff --git a/packages/dev-python/urwid/files/fix-test_vterm.patch b/packages/dev-python/urwid/files/fix-test_vterm.patch
new file mode 100644
index 0000000..7e18363
--- /dev/null
+++ b/packages/dev-python/urwid/files/fix-test_vterm.patch
@@ -0,0 +1,53 @@
+Source: Upstream
+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 4dadfccf..075c653b 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)
+
diff --git a/packages/dev-python/urwid/urwid-1.2.2.exheres-0 b/packages/dev-python/urwid/urwid-1.2.2-r1.exheres-0
index 4ce74ed..4ce74ed 100644
--- a/packages/dev-python/urwid/urwid-1.2.2.exheres-0
+++ b/packages/dev-python/urwid/urwid-1.2.2-r1.exheres-0
diff --git a/packages/dev-python/urwid/urwid-1.3.1.exheres-0 b/packages/dev-python/urwid/urwid-1.3.1-r1.exheres-0
index 4ce74ed..1fb80a9 100644
--- a/packages/dev-python/urwid/urwid-1.3.1.exheres-0
+++ b/packages/dev-python/urwid/urwid-1.3.1-r1.exheres-0
@@ -5,3 +5,7 @@ require urwid
PLATFORMS="~amd64 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/fix-test_vterm.patch
+)
+
diff --git a/packages/dev-python/urwid/urwid.exlib b/packages/dev-python/urwid/urwid.exlib
index 43fd78f..d131431 100644
--- a/packages/dev-python/urwid/urwid.exlib
+++ b/packages/dev-python/urwid/urwid.exlib
@@ -15,7 +15,7 @@ DEPENDENCIES="
recommendation:
sys-libs/ncurses
suggestion:
- dev-python/Twisted[python_abis:*(-)?] [[ description = [ for TwistedEventLoop class: ] ]]
+ net-twisted/Twisted[python_abis:*(-)?] [[ description = [ for TwistedEventLoop class: ] ]]
www-servers/apache [[ description = [ for web_display modules ] ]]
"