[Python-modules-commits] [python-future] 06/08: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository python-future.

commit 4adb5f75e702213ac7b8b31a2fb7307d98aac8b1
Merge: 92cf501 a65a425
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue May 3 22:01:46 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...x-assertion-for-pow-and-compile-on-Python.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_future/test_builtins.py                 |  5 ++-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index c1ddf3e,0000000..2fe367f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6e3c0d5f332a2f591c36d477e5c254849b7d40f5
- 6e3c0d5f332a2f591c36d477e5c254849b7d40f5
++a65a42565d94f1abdb8f75168362653232bb85cc
++a65a42565d94f1abdb8f75168362653232bb85cc
 +a221055395c07bbd060ef683775843da55465485
 +a221055395c07bbd060ef683775843da55465485
 +python-future_0.15.2.orig.tar.gz
 +431bf8ff160e8e785a2f76c3e57c1b6c2b13b41a
 +1583441
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Properly-fix-assertion-for-pow-and-compile-on-Python.patch
index 0000000,0000000..b37c499
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Properly-fix-assertion-for-pow-and-compile-on-Python.patch
@@@ -1,0 -1,0 +1,36 @@@
++From a65a42565d94f1abdb8f75168362653232bb85cc Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Tue, 3 May 2016 22:01:04 +0200
++Subject: Properly fix assertion for pow and compile on Python 3.5
++
++Bug: https://github.com/PythonCharmers/python-future/pull/201
++---
++ tests/test_future/test_builtins.py | 5 ++---
++ 1 file changed, 2 insertions(+), 3 deletions(-)
++
++diff --git a/tests/test_future/test_builtins.py b/tests/test_future/test_builtins.py
++index a6db4fdabc4c..05d597a5907c 100644
++--- a/tests/test_future/test_builtins.py
+++++ b/tests/test_future/test_builtins.py
++@@ -525,11 +525,10 @@ class BuiltinTest(unittest.TestCase):
++         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
++         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
++         # Raises TypeError in Python < v3.5, ValueError in v3.5:
++-        # self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
+++        self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
++         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
++                           mode='eval', source='0', filename='tmp')
++         compile('print("\xe5")\n', '', 'exec')
++-        self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
++         self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
++ 
++         # test the optimize argument
++@@ -1287,7 +1286,7 @@ class BuiltinTest(unittest.TestCase):
++         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
++ 
++         # Raises TypeError in Python < v3.5, ValueError in v3.5:
++-        # self.assertRaises(TypeError, pow, -1, -2, 3)
+++        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
++         self.assertRaises(ValueError, pow, 1, 2, 0)
++ 
++         self.assertRaises(TypeError, pow)
diff --cc debian/patches/series
index e97d6dd,0000000..72bad15
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +do-not-use-bootstrap.patch
 +removes-privacy-breach-in-docs.patch
 +remove-configparser-module.patch
++0004-Properly-fix-assertion-for-pow-and-compile-on-Python.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-future.git