diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-python/urwid/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-python/urwid/files')
-rw-r--r-- | dev-python/urwid/files/urwid-1.1.0-sphinx.patch | 11 | ||||
-rw-r--r-- | dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch | 52 |
2 files changed, 63 insertions, 0 deletions
diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch new file mode 100644 index 000000000000..442aeea67500 --- /dev/null +++ b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch @@ -0,0 +1,11 @@ +--- urwid-1.1.0/docs/conf.py ++++ urwid-1.1.0/docs/conf.py +@@ -46,7 +46,7 @@ + # The version info for the project you're documenting, acts as replacement for + # |version| and |release|, also used in various other places throughout the + # built documents. +-FILE_PATH = os.path.dirname(__file__).decode('utf-8') ++FILE_PATH = os.path.dirname(__file__) + VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH, + '../urwid/version.py')) + VERSION_VARS = {} 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) + |