[Python-modules-commits] [python-eventlet] 11/19: merge patched into master
Thomas Goirand
zigo at moszumanska.debian.org
Tue Nov 14 21:39:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
zigo pushed a commit to branch master
in repository python-eventlet.
commit abbf53b4a94d0e095e5712080ab70e3e17c22989
Merge: 1b44911 9b3a864
Author: Thomas Goirand <zigo at debian.org>
Date: Tue Nov 14 22:13:52 2017 +0100
merge patched into master
.travis.yml | 9 +-
AUTHORS | 7 +
NEWS | 21 +
bin/pull-dnspython | 13 +
bin/release | 1 +
debian/.git-dpm | 6 +-
...xes-tests-in-tests.patcher_test.Threading.patch | 33 -
...-Removes-line-that-is-doing-FTBFS-in-doc.patch} | 2 +-
...=> 0002-Fixed-privacy-breach-in-examples.patch} | 6 +-
...sy-CPU.patch => 0003-Allow-more-busy-CPU.patch} | 2 +-
...ts.patch => 0004-Remove-networking-tests.patch} | 10 +-
...-test.patch => 0005-Removed-failing-test.patch} | 4 +-
...hinx.patch => 0006-Patch-out-intersphinx.patch} | 2 +-
...sts-Work-around-patcher-green-package-wei.patch | 79 -
...ched-test_getaddrinfo-due-netbase-update.patch} | 12 +-
...test_server_connection_timeout_exception.patch} | 6 +-
debian/patches/series | 18 +-
doc/modules.rst | 1 +
doc/modules/dagpool.rst | 493 +++++
doc/real_index.html | 2 +-
eventlet/__init__.py | 2 +-
eventlet/convenience.py | 3 +
eventlet/dagpool.py | 602 ++++++
eventlet/green/http/__init__.py | 189 ++
eventlet/green/http/client.py | 1446 ++++++++++++-
eventlet/green/http/cookiejar.py | 2165 +++++++++++++++++++-
eventlet/green/http/cookies.py | 694 ++++++-
eventlet/green/http/server.py | 1275 +++++++++++-
eventlet/green/httplib.py | 5 +-
eventlet/green/select.py | 4 +-
eventlet/green/socket.py | 32 +-
eventlet/green/ssl.py | 53 +-
eventlet/green/subprocess.py | 21 +-
eventlet/green/urllib/request.py | 8 +-
eventlet/green/zmq.py | 90 +
eventlet/greenio/base.py | 25 +-
eventlet/greenio/py3.py | 4 +-
eventlet/hubs/hub.py | 6 +-
eventlet/patcher.py | 19 +-
eventlet/support/dns/__init__.py | 54 +
eventlet/support/dns/_compat.py | 47 +
eventlet/support/dns/dnssec.py | 457 +++++
eventlet/support/dns/e164.py | 85 +
eventlet/support/dns/edns.py | 150 ++
eventlet/support/dns/entropy.py | 141 ++
eventlet/support/dns/exception.py | 128 ++
eventlet/support/dns/flags.py | 112 +
eventlet/support/dns/grange.py | 69 +
eventlet/support/dns/hash.py | 31 +
eventlet/support/dns/inet.py | 111 +
eventlet/support/dns/ipv4.py | 59 +
eventlet/support/dns/ipv6.py | 172 ++
eventlet/support/dns/message.py | 1152 +++++++++++
eventlet/support/dns/name.py | 886 ++++++++
eventlet/support/dns/namedict.py | 104 +
eventlet/support/dns/node.py | 178 ++
eventlet/support/dns/opcode.py | 107 +
eventlet/support/dns/query.py | 539 +++++
eventlet/support/dns/rcode.py | 125 ++
eventlet/support/dns/rdata.py | 458 +++++
eventlet/support/dns/rdataclass.py | 118 ++
eventlet/support/dns/rdataset.py | 338 +++
eventlet/support/dns/rdatatype.py | 255 +++
eventlet/support/dns/rdtypes/ANY/AFSDB.py | 53 +
eventlet/support/dns/rdtypes/ANY/AVC.py | 23 +
eventlet/support/dns/rdtypes/ANY/CAA.py | 73 +
eventlet/support/dns/rdtypes/ANY/CDNSKEY.py | 25 +
eventlet/support/dns/rdtypes/ANY/CDS.py | 21 +
eventlet/support/dns/rdtypes/ANY/CERT.py | 121 ++
eventlet/support/dns/rdtypes/ANY/CNAME.py | 25 +
eventlet/support/dns/rdtypes/ANY/CSYNC.py | 124 ++
eventlet/support/dns/rdtypes/ANY/DLV.py | 21 +
eventlet/support/dns/rdtypes/ANY/DNAME.py | 24 +
eventlet/support/dns/rdtypes/ANY/DNSKEY.py | 25 +
eventlet/support/dns/rdtypes/ANY/DS.py | 21 +
eventlet/support/dns/rdtypes/ANY/EUI48.py | 29 +
eventlet/support/dns/rdtypes/ANY/EUI64.py | 29 +
eventlet/support/dns/rdtypes/ANY/GPOS.py | 160 ++
eventlet/support/dns/rdtypes/ANY/HINFO.py | 84 +
eventlet/support/dns/rdtypes/ANY/HIP.py | 113 +
eventlet/support/dns/rdtypes/ANY/ISDN.py | 97 +
eventlet/support/dns/rdtypes/ANY/LOC.py | 325 +++
eventlet/support/dns/rdtypes/ANY/MX.py | 21 +
eventlet/support/dns/rdtypes/ANY/NS.py | 21 +
eventlet/support/dns/rdtypes/ANY/NSEC.py | 126 ++
eventlet/support/dns/rdtypes/ANY/NSEC3.py | 191 ++
eventlet/support/dns/rdtypes/ANY/NSEC3PARAM.py | 88 +
eventlet/support/dns/rdtypes/ANY/PTR.py | 21 +
eventlet/support/dns/rdtypes/ANY/RP.py | 80 +
eventlet/support/dns/rdtypes/ANY/RRSIG.py | 156 ++
eventlet/support/dns/rdtypes/ANY/RT.py | 21 +
eventlet/support/dns/rdtypes/ANY/SOA.py | 114 ++
eventlet/support/dns/rdtypes/ANY/SPF.py | 23 +
eventlet/support/dns/rdtypes/ANY/SSHFP.py | 77 +
eventlet/support/dns/rdtypes/ANY/TLSA.py | 82 +
eventlet/support/dns/rdtypes/ANY/TXT.py | 21 +
eventlet/support/dns/rdtypes/ANY/URI.py | 80 +
eventlet/support/dns/rdtypes/ANY/X25.py | 64 +
eventlet/support/dns/rdtypes/ANY/__init__.py | 50 +
eventlet/support/dns/rdtypes/IN/A.py | 52 +
eventlet/support/dns/rdtypes/IN/AAAA.py | 53 +
eventlet/support/dns/rdtypes/IN/APL.py | 161 ++
eventlet/support/dns/rdtypes/IN/DHCID.py | 59 +
eventlet/support/dns/rdtypes/IN/IPSECKEY.py | 148 ++
eventlet/support/dns/rdtypes/IN/KX.py | 21 +
eventlet/support/dns/rdtypes/IN/NAPTR.py | 125 ++
eventlet/support/dns/rdtypes/IN/NSAP.py | 58 +
eventlet/support/dns/rdtypes/IN/NSAP_PTR.py | 21 +
eventlet/support/dns/rdtypes/IN/PX.py | 87 +
eventlet/support/dns/rdtypes/IN/SRV.py | 81 +
eventlet/support/dns/rdtypes/IN/WKS.py | 105 +
eventlet/support/dns/rdtypes/IN/__init__.py | 30 +
eventlet/support/dns/rdtypes/__init__.py | 24 +
eventlet/support/dns/rdtypes/dnskeybase.py | 136 ++
eventlet/support/dns/rdtypes/dsbase.py | 83 +
eventlet/support/dns/rdtypes/euibase.py | 71 +
eventlet/support/dns/rdtypes/mxbase.py | 101 +
eventlet/support/dns/rdtypes/nsbase.py | 81 +
eventlet/support/dns/rdtypes/txtbase.py | 90 +
eventlet/support/dns/renderer.py | 329 +++
eventlet/support/dns/resolver.py | 1407 +++++++++++++
eventlet/support/dns/reversename.py | 89 +
eventlet/support/dns/rrset.py | 182 ++
eventlet/support/dns/set.py | 259 +++
eventlet/support/dns/tokenizer.py | 564 +++++
eventlet/support/dns/tsig.py | 234 +++
eventlet/support/dns/tsigkeyring.py | 48 +
eventlet/support/dns/ttl.py | 68 +
eventlet/support/dns/update.py | 249 +++
eventlet/support/dns/version.py | 34 +
eventlet/support/dns/wiredata.py | 103 +
eventlet/support/dns/zone.py | 1087 ++++++++++
eventlet/support/greendns.py | 74 +-
eventlet/tpool.py | 2 +
eventlet/websocket.py | 15 +-
eventlet/wsgi.py | 45 +-
examples/websocket.html | 15 +-
setup.py | 1 +
tests/__init__.py | 21 +-
tests/convenience_test.py | 19 +-
tests/dagpool_test.py | 693 +++++++
tests/green_http_test.py | 12 +
tests/greendns_test.py | 142 +-
tests/greenio_test.py | 2 +-
.../green_http_doesnt_change_original_module.py | 8 +
.../green_httplib_doesnt_change_original_module.py | 8 +
tests/isolated/greendns_from_address_203.py | 7 +-
tests/isolated/mysqldb_monkey_patch.py | 10 +-
.../patcher_blocking_select_methods_are_deleted.py | 4 +-
tests/isolated/regular_file_readall.py | 43 +
tests/isolated/socket_resolve_green.py | 45 +
.../tpool_isolate_socket_default_timeout.py | 15 +
tests/manual/websocket-gunicorn.py | 48 +
tests/patcher_test.py | 42 +-
tests/semaphore_test.py | 5 -
tests/socket_test.py | 62 +
tests/ssl_test.py | 108 +-
tests/subprocess_test.py | 10 +
tests/test__event.py | 5 -
tests/test__greenness.py | 31 +-
tests/test__refcount.py | 5 -
tests/test__socket_errors.py | 4 -
tests/tpool_test.py | 68 +-
tests/wsgi_test.py | 58 +-
tox.ini | 9 +-
165 files changed, 23231 insertions(+), 520 deletions(-)
diff --cc debian/.git-dpm
index 8251190,0000000..4833eda
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
- cff26f9804dfd35fb006085f1e3ab9fa03693e2d
- cff26f9804dfd35fb006085f1e3ab9fa03693e2d
- a635c555cd2c3f8d446d3874c1a90c98c221d331
++9b3a864614dd2f88157b6e10ed6dc48436c3559d
++9b3a864614dd2f88157b6e10ed6dc48436c3559d
++b717fde61d936941885f6d11908d50802b22cefe
+b717fde61d936941885f6d11908d50802b22cefe
+python-eventlet_0.20.0.orig.tar.xz
+b84ed0ab1b54db4ccc5338bae84975391b90b354
+372532
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removes-line-that-is-doing-FTBFS-in-doc.patch
index 0b3e385,0000000..6c57789
mode 100644,000000..100644
--- a/debian/patches/0001-Removes-line-that-is-doing-FTBFS-in-doc.patch
+++ b/debian/patches/0001-Removes-line-that-is-doing-FTBFS-in-doc.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 398a63bbaef00411a0e2ce4af8afaa84e40f29ce Mon Sep 17 00:00:00 2001
++From 779a72126a88fc5fdad8beb5e2e67b0d68b6b823 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:14 +0200
+Subject: Removes line that is doing FTBFS in doc
+
+Forwarded: no
+---
+ doc/modules/zmq.rst | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/modules/zmq.rst b/doc/modules/zmq.rst
+index c9e925a..9e937b8 100644
+--- a/doc/modules/zmq.rst
++++ b/doc/modules/zmq.rst
+@@ -15,7 +15,6 @@
+
+ .. autoclass:: Socket
+ :show-inheritance:
+- :inherited-members:
+
+ .. automethod:: recv
+
diff --cc debian/patches/0002-Fixed-privacy-breach-in-examples.patch
index 41036fd,0000000..37d5e48
mode 100644,000000..100644
--- a/debian/patches/0002-Fixed-privacy-breach-in-examples.patch
+++ b/debian/patches/0002-Fixed-privacy-breach-in-examples.patch
@@@ -1,41 -1,0 +1,41 @@@
- From 9f849e27d9226c153be6a24f0d70d8f3b21051c9 Mon Sep 17 00:00:00 2001
++From cd4c6bc2d3f0556a07956c0e1b33221d10d7c1f7 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:15 +0200
+Subject: Fixed privacy breach in examples
+
+ Upstream is referencing external websites, we don't allow this.
+Forwarded: no
+Last-Update: 2015-05-27
+---
+ examples/websocket.html | 4 ++--
+ examples/websocket_chat.html | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/examples/websocket.html b/examples/websocket.html
- index cea6a20..952efce 100644
++index 93a66d5..293795d 100644
+--- a/examples/websocket.html
++++ b/examples/websocket.html
+@@ -3,8 +3,8 @@
+ <head>
- <!-- idea and code swiped from
++ <!-- idea and code swiped from
+ http://assorted.svn.sourceforge.net/viewvc/assorted/real-time-plotter/trunk/src/rtp.html?view=markup -->
+-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script>
+-<script src="http://people.iola.dk/olau/flot/jquery.flot.js"></script>
++<script src="jquery.min.js"></script>
++<script src="jquery.flot.js"></script>
+ <script>
+ window.onload = function() {
+ var data = {};
+diff --git a/examples/websocket_chat.html b/examples/websocket_chat.html
+index 9237532..2948591 100644
+--- a/examples/websocket_chat.html
++++ b/examples/websocket_chat.html
+@@ -1,7 +1,7 @@
+ <!DOCTYPE html>
+ <html>
+ <head>
+-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
++<script src="jquery.min.js"></script>
+ <script>
+ window.onload = function() {
+ var data = {};
diff --cc debian/patches/0003-Allow-more-busy-CPU.patch
index 825f597,0000000..bb43dc2
mode 100644,000000..100644
--- a/debian/patches/0003-Allow-more-busy-CPU.patch
+++ b/debian/patches/0003-Allow-more-busy-CPU.patch
@@@ -1,43 -1,0 +1,43 @@@
- From 104c30d25bc8b1359c2c6076d7d149887c21f447 Mon Sep 17 00:00:00 2001
++From 986d37bfaee7fc148694bb3f15dd41515f3e2f6d Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:16 +0200
+Subject: Allow more busy CPU
+
+ The tests assume a fast CPU, but under my VMs, the tests are just failing
+ with the CPU being more than 10% busy.
+Forwarded: no
+Last-Update: 2016-07-19
+---
+ tests/zmq_test.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/zmq_test.py b/tests/zmq_test.py
+index 2910c11..e925038 100644
+--- a/tests/zmq_test.py
++++ b/tests/zmq_test.py
+@@ -448,7 +448,7 @@ class TestUpstreamDownStream(tests.LimitedTestCase):
+ self.sockets.append(sock)
+ sock.bind_to_random_port("tcp://127.0.0.1")
+ sleep()
+- tests.check_idle_cpu_usage(0.2, 0.1)
++ tests.check_idle_cpu_usage(0.2, 0.2)
+
+ @tests.skip_unless(zmq_supported)
+ def test_cpu_usage_after_pub_send_or_dealer_recv(self):
+@@ -460,14 +460,14 @@ class TestUpstreamDownStream(tests.LimitedTestCase):
+ sub.setsockopt(zmq.SUBSCRIBE, b"")
+ sleep()
+ pub.send(b'test_send')
+- tests.check_idle_cpu_usage(0.2, 0.1)
++ tests.check_idle_cpu_usage(0.2, 0.2)
+
+ sender, receiver, _port = self.create_bound_pair(zmq.DEALER, zmq.DEALER)
+ sleep()
+ sender.send(b'test_recv')
+ msg = receiver.recv()
+ self.assertEqual(msg, b'test_recv')
+- tests.check_idle_cpu_usage(0.2, 0.1)
++ tests.check_idle_cpu_usage(0.2, 0.2)
+
+
+ class TestQueueLock(tests.LimitedTestCase):
diff --cc debian/patches/0004-Remove-networking-tests.patch
index 226f434,0000000..a7a4c21
mode 100644,000000..100644
--- a/debian/patches/0004-Remove-networking-tests.patch
+++ b/debian/patches/0004-Remove-networking-tests.patch
@@@ -1,76 -1,0 +1,76 @@@
- From 315f6ddb0c1d3206afe1b5008b84b3cf94683976 Mon Sep 17 00:00:00 2001
++From 68d2e5b5da2da0a22e07c605ca4dccd57a0e3cb6 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:18 +0200
+Subject: Remove networking tests
+
+ Upstream is attempting connection to 192.0.2.1 on port 80, and expects
+ it to always timeout. However, some Debian users may well have a web
+ server running on that IP address, meaning the test would fail in such
+ setup (even if this is reserved IANA IPs). Therefore, removing such bad
+ tests.
+ .
+ Also, these tests have been failing for a reason on my arm64 builder,
+ probably because it's a slow machine.
+Forwarded: no
+Last-Update: 2016-07-19
+---
+ tests/greenio_test.py | 20 --------------------
+ tests/socket_test.py | 7 -------
+ 2 files changed, 27 deletions(-)
+
+diff --git a/tests/greenio_test.py b/tests/greenio_test.py
- index 99119b3..335b6cb 100644
++index 619ccd0..4e0069d 100644
+--- a/tests/greenio_test.py
++++ b/tests/greenio_test.py
+@@ -74,18 +74,6 @@ class TestGreenSocket(tests.LimitedTestCase):
+ # 3.x io write to closed file-like pbject raises ValueError
+ self.assertRaises(ValueError, fd.write, b'a')
+
+- def test_connect_timeout(self):
+- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+- s.settimeout(0.1)
+- gs = greenio.GreenSocket(s)
+-
+- try:
+- expect_socket_timeout(gs.connect, ('192.0.2.1', 80))
+- except socket.error as e:
+- # unreachable is also a valid outcome
+- if not get_errno(e) in (errno.EHOSTUNREACH, errno.ENETUNREACH):
+- raise
+-
+ def test_accept_timeout(self):
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.bind(('', 0))
+@@ -95,14 +83,6 @@ class TestGreenSocket(tests.LimitedTestCase):
+ gs = greenio.GreenSocket(s)
+ expect_socket_timeout(gs.accept)
+
+- def test_connect_ex_timeout(self):
+- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+- s.settimeout(0.1)
+- gs = greenio.GreenSocket(s)
+- e = gs.connect_ex(('192.0.2.1', 80))
+- if e not in (errno.EHOSTUNREACH, errno.ENETUNREACH):
+- self.assertEqual(e, errno.EAGAIN)
+-
+ def test_recv_timeout(self):
+ listener = greenio.GreenSocket(socket.socket())
+ listener.bind(('', 0))
+diff --git a/tests/socket_test.py b/tests/socket_test.py
- index 634e1f0..edbc21e 100644
++index 954eba3..241ce83 100644
+--- a/tests/socket_test.py
++++ b/tests/socket_test.py
- @@ -2,13 +2,6 @@ import eventlet
- from eventlet.green import socket
++@@ -9,13 +9,6 @@ from eventlet.support import greendns
++ import tests
+
+
+-def test_create_connection_error():
+- try:
+- socket.create_connection(('192.0.2.1', 80), timeout=0.1)
+- except (IOError, OSError):
+- pass
+-
+-
+ def test_recv_type():
+ # https://github.com/eventlet/eventlet/issues/245
+ # socket recv returning multiple data types
diff --cc debian/patches/0005-Removed-failing-test.patch
index b031d8b,0000000..0b2cf34
mode 100644,000000..100644
--- a/debian/patches/0005-Removed-failing-test.patch
+++ b/debian/patches/0005-Removed-failing-test.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 24925cd35edcad3348c7db97903908afc828f2a5 Mon Sep 17 00:00:00 2001
++From b51e359bd18a8f625c50becd55fa455c183c6f94 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:20 +0200
+Subject: Removed failing test
+
+ This test fails in Sid.
+Forwarded: no
+Last-Update: 2016-10-07
+---
+ tests/patcher_test.py | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/tests/patcher_test.py b/tests/patcher_test.py
- index ea7b393..28091c2 100644
++index fb9c19b..f1c8c34 100644
+--- a/tests/patcher_test.py
++++ b/tests/patcher_test.py
+@@ -82,28 +82,6 @@ class ImportPatched(ProcessBase):
+ assert 'eventlet.green.urllib' in lines[2], repr(output)
+ assert 'eventlet.green.httplib' not in lines[2], repr(output)
+
+- def test_import_patched_defaults(self):
+- self.write_to_tempfile("base", """
+-import socket
+-try:
+- import urllib.request as urllib
+-except ImportError:
+- import urllib
+-print("base {0} {1}".format(socket, urllib))""")
+-
+- new_mod = """
+-from eventlet import patcher
+-base = patcher.import_patched('base')
+-print("newmod {0} {1} {2}".format(base, base.socket, base.urllib.socket.socket))
+-"""
+- self.write_to_tempfile("newmod", new_mod)
+- output, lines = self.launch_subprocess('newmod.py')
+- assert lines[0].startswith('base'), repr(output)
+- assert lines[1].startswith('newmod'), repr(output)
+- assert 'eventlet.green.socket' in lines[1], repr(output)
+- assert 'GreenSocket' in lines[1], repr(output)
+-
+-
+ class MonkeyPatch(ProcessBase):
+ def test_patched_modules(self):
+ new_mod = """
diff --cc debian/patches/0006-Patch-out-intersphinx.patch
index 213c796,0000000..b80c89d
mode 100644,000000..100644
--- a/debian/patches/0006-Patch-out-intersphinx.patch
+++ b/debian/patches/0006-Patch-out-intersphinx.patch
@@@ -1,26 -1,0 +1,26 @@@
- From e74c59dfa798a7b25dc1acf923d3c76079b879ac Mon Sep 17 00:00:00 2001
++From 402d2d08b7d913a0b6368343fbc78339c132b7e7 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:21 +0200
+Subject: Patch out intersphinx
+
+ Avoids internet access during build
+Bug-Debian: https://bugs.debian.org/840092
+Forwarded: no
+Last-Update: 2016-10-08
+---
+ doc/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index cda080f..5b7889d 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -23,7 +23,7 @@ import sys, os
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage',
+- 'sphinx.ext.intersphinx']
++ ]
+
+ # If this is True, '.. todo::' and '.. todolist::' produce output, else they produce
+ # nothing. The default is False.
diff --cc debian/patches/0007-Patched-test_getaddrinfo-due-netbase-update.patch
index 85c5535,0000000..e4553e8
mode 100644,000000..100644
--- a/debian/patches/0007-Patched-test_getaddrinfo-due-netbase-update.patch
+++ b/debian/patches/0007-Patched-test_getaddrinfo-due-netbase-update.patch
@@@ -1,66 -1,0 +1,66 @@@
- From 249ce93330decca1352c3e5ace9e9442fd05516f Mon Sep 17 00:00:00 2001
++From d344d2b3587c669e087dc9169822c6c34e488886 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Kobli=C5=BEek?= <koblizeko at gmail.com>
+Date: Fri, 4 Aug 2017 21:47:22 +0200
+Subject: Patched test_getaddrinfo due netbase update
+
+ Asserting udp for ssh introduce test failures with netbase 5.4
+ because removed ssh (22/udp).
+ This fix changes ssh -> domain, which better suit for test name and
+ allows tcp and udp simultaneously.
+Forwarded: https://github.com/eventlet/eventlet/pull/375
+---
+ tests/greendns_test.py | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/greendns_test.py b/tests/greendns_test.py
- index 88a6518..53ede37 100644
++index cf17999..6ffc28f 100644
+--- a/tests/greendns_test.py
++++ b/tests/greendns_test.py
- @@ -509,11 +509,11 @@ class TestGetaddrinfo(tests.LimitedTestCase):
++@@ -458,11 +458,11 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+ greendns.resolve = _make_mock_resolve()
+ greendns.resolve.add('example.com', '127.0.0.2')
+ greendns.resolve.add('example.com', '::1')
+- res = greendns.getaddrinfo('example.com', 'ssh')
+- addr = ('127.0.0.2', 22)
++ res = greendns.getaddrinfo('example.com', 'domain')
++ addr = ('127.0.0.2', 53)
+ tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr)
+ udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr)
+- addr = ('::1', 22, 0, 0)
++ addr = ('::1', 53, 0, 0)
+ tcp6 = (socket.AF_INET6, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr)
+ udp6 = (socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr)
+ filt_res = [ai[:3] + (ai[4],) for ai in res]
- @@ -527,8 +527,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
++@@ -475,8 +475,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+ greendns.resolve = _make_mock_resolve()
+ idn_name = u'евентлет.com'
+ greendns.resolve.add(idn_name.encode('idna').decode('ascii'), '127.0.0.2')
+- res = greendns.getaddrinfo(idn_name, 'ssh')
+- addr = ('127.0.0.2', 22)
++ res = greendns.getaddrinfo(idn_name, 'domain')
++ addr = ('127.0.0.2', 53)
+ tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr)
+ udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr)
+ filt_res = [ai[:3] + (ai[4],) for ai in res]
- @@ -539,8 +539,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
++@@ -486,8 +486,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+ def test_getaddrinfo_inet(self):
+ greendns.resolve = _make_mock_resolve()
+ greendns.resolve.add('example.com', '127.0.0.2')
+- res = greendns.getaddrinfo('example.com', 'ssh', socket.AF_INET)
+- addr = ('127.0.0.2', 22)
++ res = greendns.getaddrinfo('example.com', 'domain', socket.AF_INET)
++ addr = ('127.0.0.2', 53)
+ tcp = (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr)
+ udp = (socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr)
+ assert tcp in [ai[:3] + (ai[4],) for ai in res]
- @@ -550,8 +550,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
++@@ -496,8 +496,8 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+ def test_getaddrinfo_inet6(self):
+ greendns.resolve = _make_mock_resolve()
+ greendns.resolve.add('example.com', '::1')
+- res = greendns.getaddrinfo('example.com', 'ssh', socket.AF_INET6)
+- addr = ('::1', 22, 0, 0)
++ res = greendns.getaddrinfo('example.com', 'domain', socket.AF_INET6)
++ addr = ('::1', 53, 0, 0)
+ tcp = (socket.AF_INET6, socket.SOCK_STREAM, socket.IPPROTO_TCP, addr)
+ udp = (socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP, addr)
+ assert tcp in [ai[:3] + (ai[4],) for ai in res]
diff --cc debian/patches/0008-Disable-test_server_connection_timeout_exception.patch
index 132a2dc,0000000..71dc284
mode 100644,000000..100644
--- a/debian/patches/0008-Disable-test_server_connection_timeout_exception.patch
+++ b/debian/patches/0008-Disable-test_server_connection_timeout_exception.patch
@@@ -1,35 -1,0 +1,35 @@@
- From cff26f9804dfd35fb006085f1e3ab9fa03693e2d Mon Sep 17 00:00:00 2001
++From 9b3a864614dd2f88157b6e10ed6dc48436c3559d Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Fri, 4 Aug 2017 21:47:23 +0200
+Subject: Disable test_server_connection_timeout_exception()
+
+ As per the bug report, the test is non-deterministic. Therefore,
+ remove it it.
+Bug-Debian: https://bugs.debian.org/857893
+Forwarded: no
+Last-Update: 2017-03-16
+---
+ tests/wsgi_test.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/wsgi_test.py b/tests/wsgi_test.py
- index 6b3c251..d651a35 100644
++index bc581a8..a22e688 100644
+--- a/tests/wsgi_test.py
++++ b/tests/wsgi_test.py
- @@ -1464,11 +1464,11 @@ class TestHttpd(_TestBase):
++@@ -1477,11 +1477,11 @@ class TestHttpd(_TestBase):
+ request_thread.wait()
+ server_sock.close()
+
+- def test_server_connection_timeout_exception(self):
+- # Handle connection socket timeouts
+- # https://bitbucket.org/eventlet/eventlet/issue/143/
+- # Runs tests.wsgi_test_conntimeout in a separate process.
+- tests.run_isolated('wsgi_connection_timeout.py')
++# def test_server_connection_timeout_exception(self):
++# # Handle connection socket timeouts
++# # https://bitbucket.org/eventlet/eventlet/issue/143/
++# # Runs tests.wsgi_test_conntimeout in a separate process.
++# tests.run_isolated('wsgi_connection_timeout.py')
+
+ def test_server_socket_timeout(self):
+ self.spawn_server(socket_timeout=0.1)
diff --cc debian/patches/series
index af64be2,0000000..0543c7e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,8 @@@
- 0001-Fixes-tests-in-tests.patcher_test.Threading.patch
- 0002-Removes-line-that-is-doing-FTBFS-in-doc.patch
- 0003-Fixed-privacy-breach-in-examples.patch
- 0004-Allow-more-busy-CPU.patch
- 0005-Remove-networking-tests.patch
- 0006-greendns-tests-Work-around-patcher-green-package-wei.patch
- 0007-Removed-failing-test.patch
- 0008-Patch-out-intersphinx.patch
- 0009-Patched-test_getaddrinfo-due-netbase-update.patch
- 0010-Disable-test_server_connection_timeout_exception.patch
++0001-Removes-line-that-is-doing-FTBFS-in-doc.patch
++0002-Fixed-privacy-breach-in-examples.patch
++0003-Allow-more-busy-CPU.patch
++0004-Remove-networking-tests.patch
++0005-Removed-failing-test.patch
++0006-Patch-out-intersphinx.patch
++0007-Patched-test_getaddrinfo-due-netbase-update.patch
++0008-Disable-test_server_connection_timeout_exception.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-eventlet.git
More information about the Python-modules-commits
mailing list