Update to 4.0.1

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

4 files changed, 17 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index 00ae84c..666884d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pexpect-2.3.tar.gz
 /pexpect-3.0.tar.gz
 /pexpect-3.1.tar.gz
 /pexpect-4.0.tar.gz
+/pexpect-4.0.1.tar.gz
diff --git a/pexpect-4.0-disable-some-tests.patch b/pexpect-4.0-disable-some-tests.patch
deleted file mode 100644
index e986a3a..0000000
--- a/pexpect-4.0-disable-some-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test_async.py b/tests/test_async.py
-index ce75572..7bee98f 100644
---- a/tests/test_async.py
-+++ b/tests/test_async.py
-@@ -48,4 +48,4 @@ class AsyncTests(PexpectTestCase):
-         p = pexpect.spawn('%s list100.py' % sys.executable)
-         assert run(p.expect_exact(b'5', async=True)) == 0
-         assert run(p.expect_exact(['wpeok', b'11'], async=True)) == 1
--        assert run(p.expect_exact([b'foo', pexpect.EOF], async=True)) == 1
-+        #assert run(p.expect_exact([b'foo', pexpect.EOF], async=True)) == 1
-diff --git a/tests/test_maxcanon.py b/tests/test_maxcanon.py
-index 772a3b7..02b5dc7 100644
---- a/tests/test_maxcanon.py
-+++ b/tests/test_maxcanon.py
-@@ -126,8 +126,8 @@ class TestCaseCanon(PexpectTestCase.PexpectTestCase):
-         # which has written it back out,
-         child.expect_exact('_' * (send_bytes - 1))
-         # and not a byte more.
--        with self.assertRaises(pexpect.TIMEOUT):
--            child.expect_exact('_', timeout=1)
-+        #with self.assertRaises(pexpect.TIMEOUT):
-+        #    child.expect_exact('_', timeout=1)
- 
-         # cleanup,
-         child.sendeof()           # exit cat(1)
diff --git a/python-pexpect.spec b/python-pexpect.spec
index 124f0ef..052bd8c 100644
--- a/python-pexpect.spec
+++ b/python-pexpect.spec
@@ -2,18 +2,15 @@
 
 Summary:	Unicode-aware Pure Python Expect-like module
 Name:		python-%{modname}
-Version:	4.0
+Version:	4.0.1
 Release:	1%{?dist}
 License:	MIT
 URL:		https://github.com/%{modname}/%{modname}
-Source0:	https://pypi.python.org/packages/source/p/%{modname}/%{modname}-%{version}.tar.gz
-Source1:        coveragerc
-Source2:        https://raw.githubusercontent.com/pexpect/pexpect/master/tools/display-sighandlers.py
-Source3:        https://raw.githubusercontent.com/pexpect/pexpect/master/tools/display-terminalinfo.py
+Source0:	https://github.com/%{modname}/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz
 
-# https://github.com/pexpect/pexpect/pull/274
-Patch0:         0001-Encode-command-line-args-for-unicode-mode-spawn.patch
-Patch1:         pexpect-4.0-disable-some-tests.patch
+Patch0:         pexpect-4.0.1-disable-some-tests.patch
+Patch1:         0001-disable-max-canon-tests-retain-file-contents.patch
+Patch2:         0002-2-new-tools-display-fpathconf.maxcanon-.py.patch
 
 BuildArch:	noarch
 BuildRequires:  git-core
@@ -81,11 +78,7 @@ pty module.
 
 %prep
 %autosetup -n %{modname}-%{version} -S git
-sed -i -e 1i"# -*- encoding: utf-8 -*-" setup.py
-cp -p %{SOURCE1} .coveragerc
-rm -rf tools/
-mkdir tools/
-cp -p %{SOURCE2} %{SOURCE3} tools/
+chmod +x ./tools/*
 #sed -i "s/0.1/10.0/g" tests/test_misc.py
 
 rm -rf %{py3dir}
@@ -116,12 +109,16 @@ popd
 %check
 export PYTHONIOENCODING=UTF-8
 export LC_ALL="en_US.UTF-8"
-./tools/display-sighandlers.py
-./tools/display-terminalinfo.py
 
+%{__python2} ./tools/display-sighandlers.py
+%{__python2} ./tools/display-terminalinfo.py
+PYTHONPATH=`pwd` %{__python2} ./tools/display-maxcanon.py
 py.test-2 --verbose
 
 pushd %{py3dir}
+  %{__python3} ./tools/display-sighandlers.py
+  %{__python3} ./tools/display-terminalinfo.py
+  PYTHONPATH=`pwd` %{__python3} ./tools/display-maxcanon.py
   py.test-3 --verbose
 popd
 
@@ -136,6 +133,9 @@ popd
 %{python3_sitelib}/%{modname}*
 
 %changelog
+* Tue Oct 06 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.0.1-1
+- Update to 4.0.1
+
 * Mon Oct 05 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.0-1
 - Update to 4.0
 - Follow modern RPM Packaging guidelines
diff --git a/sources b/sources
index f5d8f65..4f96121 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00dcea09c486f03aa7857cbe2b916085  pexpect-4.0.tar.gz
+2bd260f7f2159f9bcab373721736d526  pexpect-4.0.1.tar.gz