forked from pool/python-eventlet
Matej Cepl
1dd3d84835
- Add pr_639.patch which fixes eventlet using dnspython 2.0.0 - Add remove_nose_part_2.patch to complete the removal of nose - Activate test suite with 958 test cases passing on Tumbleweed OBS-URL: https://build.opensuse.org/request/show/827530 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-eventlet?expand=0&rev=73
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
commit 46fc185c8f92008c65aef2713fc1445bfc5f6fec
|
|
Author: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
|
|
Date: Mon Jul 20 17:21:30 2020 +0000
|
|
|
|
Replace dnspython "_compute_expiration" by "_compute_times".
|
|
|
|
In dnspython v2.0.0, "_compute_expiration" was replaced by
|
|
"_compute_times". Once the minimum version of dnspython is
|
|
v2.0.0, we can remove this wrapping method.
|
|
|
|
Closes-Bug: #1888258
|
|
Fixes: #629
|
|
|
|
diff --git a/eventlet/support/greendns.py b/eventlet/support/greendns.py
|
|
index 13968c2..19b83c9 100644
|
|
--- a/eventlet/support/greendns.py
|
|
+++ b/eventlet/support/greendns.py
|
|
@@ -118,6 +118,15 @@ def is_ip_addr(host):
|
|
return is_ipv4_addr(host) or is_ipv6_addr(host)
|
|
|
|
|
|
+def compute_expiration(query, timeout):
|
|
+ # NOTE(ralonsoh): in dnspython v2.0.0, "_compute_expiration" was replaced
|
|
+ # by "_compute_times".
|
|
+ if hasattr(query, '_compute_expiration'):
|
|
+ return query._compute_expiration(timeout)
|
|
+ else:
|
|
+ return query._compute_times(timeout)[1]
|
|
+
|
|
+
|
|
class HostsAnswer(dns.resolver.Answer):
|
|
"""Answer class for HostsResolver object"""
|
|
|
|
@@ -709,7 +718,7 @@ def udp(q, where, timeout=DNS_QUERY_TIMEOUT, port=53,
|
|
s = socket.socket(af, socket.SOCK_DGRAM)
|
|
s.settimeout(timeout)
|
|
try:
|
|
- expiration = dns.query._compute_expiration(timeout)
|
|
+ expiration = compute_expiration(dns.query, timeout)
|
|
if source is not None:
|
|
s.bind(source)
|
|
while True:
|
|
@@ -802,7 +811,7 @@ def tcp(q, where, timeout=DNS_QUERY_TIMEOUT, port=53,
|
|
s = socket.socket(af, socket.SOCK_STREAM)
|
|
s.settimeout(timeout)
|
|
try:
|
|
- expiration = dns.query._compute_expiration(timeout)
|
|
+ expiration = compute_expiration(dns.query, timeout)
|
|
if source is not None:
|
|
s.bind(source)
|
|
while True:
|