From 985a624954e3b093d45b6d6c433579c5cb283b08 Mon Sep 17 00:00:00 2001
From: David Cantrell <david.l.cantrell@gmail.com>
Date: Nov 15 2017 19:14:35 +0000
Subject: Apply upstream fix for EINTR handling in test_vterm test case

Apply upstream fix for test_remove_watch_file flakiness
Apply upstream fix for test_vterm handling of NUL characters

---

diff --git a/python-urwid-test_vterm-NUL.patch b/python-urwid-test_vterm-NUL.patch
new file mode 100644
index 0000000..ee6f17a
--- /dev/null
+++ b/python-urwid-test_vterm-NUL.patch
@@ -0,0 +1,9 @@
+commit c29b072e1f6df12e237a1294e249943222879536
+Merge: 1a6772e d32f864
+Author: Ian Ward <ian@excess.org>
+Date:   Tue Aug 22 14:32:39 2017 -0400
+
+    Merge pull request #243 from Sjc1000/master
+    
+    Fixed Terminal widget crashes with Python3
+
diff --git a/python-urwid.spec b/python-urwid.spec
index 04dd72f..15a7d89 100644
--- a/python-urwid.spec
+++ b/python-urwid.spec
@@ -10,8 +10,11 @@ Source0:       https://pypi.python.org/packages/source/u/urwid/urwid-%{version}.
 # https://github.com/urwid/urwid/pull/237/commits/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3
 Patch0:        python-urwid-test_vterm-EINTR.patch
 
+# https://github.com/urwid/urwid/commit/701138a380fac06023e5915448af92ba13614cb9
+Patch1:        python-urwid-test_vterm-NUL.patch
+
 # https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387
-Patch1:        python-urwid-test_event_loops.patch
+Patch2:        python-urwid-test_event_loops.patch
 
 %global _description\
 Urwid is a Python library for making text console applications.  It has\
@@ -50,6 +53,7 @@ BuildRequires: /usr/bin/2to3
 %setup -q -n urwid-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 find urwid -type f -name "*.py" -exec sed -i -e '/^#!\//, 1d' {} \;
 find urwid -type f -name "*.py" -exec chmod 644 {} \;
 
@@ -95,6 +99,7 @@ popd
 * Wed Nov 15 2017 David Cantrell <dcantrell@redhat.com> - 1.3.1-2
 - Apply upstream fix for EINTR handling in test_vterm test case
 - Apply upstream fix for test_remove_watch_file flakiness
+- Apply upstream fix for test_vterm handling of NUL characters
 
 * Sat Aug 19 2017 Petr Viktorin <pviktori@redhat.com> - 1.3.1-1
 - Update to upstream bugfix release 1.3.1