summaryrefslogtreecommitdiff
path: root/dns/query.py
diff options
context:
space:
mode:
authorBob Halley <halley@dnspython.org>2018-12-09 12:06:24 -0800
committerBob Halley <halley@dnspython.org>2018-12-09 12:06:24 -0800
commit129f9e79ff508e36bac08fd588769525d9214a57 (patch)
tree8d5c0dc44ef1e232d1e87e38f1c777aba74c81ff /dns/query.py
parenta0a975bc26728996313425ad4ba8b1281849153c (diff)
downloaddnspython-129f9e79ff508e36bac08fd588769525d9214a57.tar.gz
Remove _compat module.
Diffstat (limited to 'dns/query.py')
-rw-r--r--dns/query.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/dns/query.py b/dns/query.py
index c0c517c..20c953c 100644
--- a/dns/query.py
+++ b/dns/query.py
@@ -33,12 +33,6 @@ import dns.message
import dns.rcode
import dns.rdataclass
import dns.rdatatype
-from ._compat import long, string_types, PY3
-
-if PY3:
- select_error = OSError
-else:
- select_error = select.error
# Function used to create a socket. Can be overridden if needed in special
# situations.
@@ -87,7 +81,7 @@ def _poll_for(fd, readable, writable, error, timeout):
pollable.register(fd, event_mask)
if timeout:
- event_list = pollable.poll(long(timeout * 1000))
+ event_list = pollable.poll(timeout * 1000)
else:
event_list = pollable.poll()
@@ -130,7 +124,7 @@ def _wait_for(fd, readable, writable, error, expiration):
try:
if not _polling_backend(fd, readable, writable, error, timeout):
raise dns.exception.Timeout
- except select_error as e:
+ except OSError as e:
if e.args[0] != errno.EINTR:
raise e
done = True
@@ -562,9 +556,9 @@ def xfr(where, zone, rdtype=dns.rdatatype.AXFR, rdclass=dns.rdataclass.IN,
Returns a generator of ``dns.message.Message`` objects.
"""
- if isinstance(zone, string_types):
+ if isinstance(zone, str):
zone = dns.name.from_text(zone)
- if isinstance(rdtype, string_types):
+ if isinstance(rdtype, str):
rdtype = dns.rdatatype.from_text(rdtype)
q = dns.message.make_query(zone, rdtype, rdclass)
if rdtype == dns.rdatatype.IXFR: