[Python-modules-commits] [python-tornado] 02/05: merge patched into master

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository python-tornado.

commit d8eaae008f29e7ff7b21a312a12a42215ace8e58
Merge: ab9a73f df1105b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 24 12:58:19 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...suite-failure-when-sockets-is-not-defined.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tornado/test/netutil_test.py                       |  1 +
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index bb34b9c,0000000..c129e9a
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
- 44ee8c84f5de63d02dfee6784814ca823672687a
- 44ee8c84f5de63d02dfee6784814ca823672687a
++df1105b186eccf103277d0ccddd4c88e9f9d3c08
++df1105b186eccf103277d0ccddd4c88e9f9d3c08
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +python-tornado_4.3.0.orig.tar.gz
 +b488ab5baa09167699d2baa8e443d0aa07a57c99
 +475749
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Fix-testsuite-failure-when-sockets-is-not-defined.patch
index 0000000,0000000..fd7cade
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Fix-testsuite-failure-when-sockets-is-not-defined.patch
@@@ -1,0 -1,0 +1,27 @@@
++From df1105b186eccf103277d0ccddd4c88e9f9d3c08 Mon Sep 17 00:00:00 2001
++From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
++Date: Tue, 24 May 2016 12:29:51 +0200
++Subject: Fix testsuite failure when sockets is not defined
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++this fixes the UnboundLocalError issue
++"UnboundLocalError: local variable 'sockets' referenced before assignment"
++Thanks Ondřej Nový for the help
++---
++ tornado/test/netutil_test.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
++index 78331ce..79f35c0 100644
++--- a/tornado/test/netutil_test.py
+++++ b/tornado/test/netutil_test.py
++@@ -203,6 +203,7 @@ class TestPortAllocation(unittest.TestCase):
++ 
++     @unittest.skipIf(not hasattr(socket, "SO_REUSEPORT"), "SO_REUSEPORT is not supported")
++     def test_reuse_port(self):
+++        sockets = []
++         socket, port = bind_unused_port(reuse_port=True)
++         try:
++             sockets = bind_sockets(port, 'localhost', reuse_port=True)
diff --cc debian/patches/series
index 4fb1888,0000000..d5dbd2e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +domain-test.patch
 +ignoreuserwarning.patch
 +skip-timing-tests.patch
 +sockopt.patch
 +without-certifi.patch
 +fix-ftbfs-on-hurd.patch
++0007-Fix-testsuite-failure-when-sockets-is-not-defined.patch

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