diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-python/urwid/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
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, 0 insertions, 63 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 deleted file mode 100644 index 442aeea67500..000000000000 --- a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 04b6e2c949c4..000000000000 --- a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch +++ /dev/null @@ -1,52 +0,0 @@ -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) - |