Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4

3 files changed, 51 insertions, 1 deletions

diff --git a/python-execnet-fix-test-channel-on-python-3.4.patch b/python-execnet-fix-test-channel-on-python-3.4.patch
new file mode 100644
index 0000000..87e0ecc
--- /dev/null
+++ b/python-execnet-fix-test-channel-on-python-3.4.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Robert Kuska <rkuska@redhat.com>
+# Date 1400488914 -7200
+# Node ID 8b3f3a14d53c561f0bae1990dc251d5fde09432e
+# Parent  6f3729e2c7eb97616a71b8f917b4f4986dfdd8b7
+Fixes test in test_channel according the new exec traceback in py3.4
+
+diff --git a/testing/test_channel.py b/testing/test_channel.py
+--- a/testing/test_channel.py
++++ b/testing/test_channel.py
+@@ -72,9 +72,10 @@
+             channel.receive()
+         except channel.RemoteError:
+             e = sys.exc_info()[1]
++            print(e)
+             assert str(e).startswith('Traceback (most recent call last):')
+-            assert str(e).find('NameError: global name \'foobar\' '
+-                               'is not defined') > -1
++            assert str(e).find('NameError') > -1
++            assert str(e).find('foobar') > -1
+         else:
+             pytest.fail('No exception raised')
+ 
diff --git a/python-execnet-remove-redundant-print-statement.patch b/python-execnet-remove-redundant-print-statement.patch
new file mode 100644
index 0000000..cc2b38b
--- /dev/null
+++ b/python-execnet-remove-redundant-print-statement.patch
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User Robert Kuska <rkuska@redhat.com>
+# Date 1400489832 -7200
+# Node ID 47ff3652b0aed191f7bafc741c211d1415f65224
+# Parent  8b3f3a14d53c561f0bae1990dc251d5fde09432e
+Remove redudant print statement
+
+diff --git a/testing/test_channel.py b/testing/test_channel.py
+--- a/testing/test_channel.py
++++ b/testing/test_channel.py
+@@ -72,7 +72,6 @@
+             channel.receive()
+         except channel.RemoteError:
+             e = sys.exc_info()[1]
+-            print(e)
+             assert str(e).startswith('Traceback (most recent call last):')
+             assert str(e).find('NameError') > -1
+             assert str(e).find('foobar') > -1
diff --git a/python-execnet.spec b/python-execnet.spec
index 9f6cd5b..b2f320f 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -9,7 +9,7 @@
 
 Name:           python-%{srcname}
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Elastic Python Deployment
 Group:          Development/Languages
 # package is now under the MIT license, (although the docs still say
@@ -18,6 +18,10 @@ Group:          Development/Languages
 License:        MIT and GPLv2+
 URL:            http://codespeak.net/execnet
 Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.tar.gz
+# https://bitbucket.org/hpk42/execnet/pull-request/10/fixes-test-in-test_channel-according-the/diff
+Patch0:         python-execnet-fix-test-channel-on-python-3.4.patch
+# https://bitbucket.org/hpk42/execnet/pull-request/11/remove-redudant-print-statement/diff
+Patch1:         python-execnet-remove-redundant-print-statement.patch
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -71,6 +75,8 @@ minimal and fast API targetting the following uses:
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 # remove shebangs and fix permissions
 find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
@@ -132,6 +138,9 @@ popd
 
 
 %changelog
+* Mon May 19 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
 * Fri Apr 18 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.2.0-1
 - Update to 1.2.0.
 - Update license.