more (str,unicode) -> str conversion

diff --git a/dns/dnssec.py b/dns/dnssec.py
index 9c1d5f3da2f7f2d42e82c51676da973c1a523f5e..7ba9b0329786d28619f096beecd0070cbfb2e516 100644 (file)
--- a/dns/dnssec.py
+++ b/dns/dnssec.py
@@ -116,7 +116,7 @@ def make_ds(name, key, algorithm, origin=None):
     else:
         raise UnsupportedAlgorithm('unsupported algorithm "%s"' % algorithm)
 
-    if isinstance(name, (str, unicode)):
+    if isinstance(name, str):
         name = dns.name.from_text(name, origin)
     hash.update(name.canonicalize().to_wire())
     hash.update(_to_rdata(key, origin))
@@ -214,7 +214,7 @@ def _validate_rrsig(rrset, rrsig, keys, origin=None, now=None):
     @type now: int
     """
 
-    if isinstance(origin, (str, unicode)):
+    if isinstance(origin, str):
         origin = dns.name.from_text(origin, dns.name.root)
 
     key = _find_key(keys, rrsig)
@@ -331,7 +331,7 @@ def _validate(rrset, rrsigset, keys, origin=None, now=None):
     @type now: int
     """
 
-    if isinstance(origin, (str, unicode)):
+    if isinstance(origin, str):
         origin = dns.name.from_text(origin, dns.name.root)
 
     if isinstance(rrset, tuple):

diff --git a/dns/e164.py b/dns/e164.py
index 104aae960f1b6d14e7c89eaa731dcc09e3311e50..bd846b61bd2b14bdb920637ad471024dc12c2147 100644 (file)
--- a/dns/e164.py
+++ b/dns/e164.py
@@ -69,7 +69,7 @@ def query(number, domains, resolver=None):
     if resolver is None:
         resolver = dns.resolver.get_default_resolver()
     for domain in domains:
-        if isinstance(domain, (str, unicode)):
+        if isinstance(domain, str):
             domain = dns.name.from_text(domain)
         qname = dns.e164.from_e164(number, domain)
         try:

diff --git a/dns/query.py b/dns/query.py
index c7144915b14af0484f0f1b72d95e9670b91b5396..5e010751f0b26356af463afa331e933350e24425 100644 (file)
--- a/dns/query.py
+++ b/dns/query.py
@@ -372,7 +372,7 @@ def xfr(where, zone, rdtype=dns.rdatatype.AXFR, rdclass=dns.rdataclass.IN,
     @type keyalgorithm: string
     """
 
-    if isinstance(zone, (str, unicode)):
+    if isinstance(zone, str):
         zone = dns.name.from_text(zone)
     if isinstance(rdtype, str):
         rdtype = dns.rdatatype.from_text(rdtype)

diff --git a/dns/rrset.py b/dns/rrset.py
index 0ba7a3e25a52018f44232de097cf34c0992f51d3..62ea66d703f300186e4be6ade8bfb78d0e043a5d 100644 (file)
--- a/dns/rrset.py
+++ b/dns/rrset.py
@@ -151,7 +151,7 @@ def from_rdata_list(name, ttl, rdatas):
     @rtype: dns.rrset.RRset object
     """
 
-    if isinstance(name, (str, unicode)):
+    if isinstance(name, str):
         name = dns.name.from_text(name, None)
 
     if len(rdatas) == 0: