diff options
| author | Bob Halley <halley@nominum.com> | 2011-04-28 21:33:15 +0100 |
|---|---|---|
| committer | Bob Halley <halley@nominum.com> | 2011-04-28 21:33:15 +0100 |
| commit | 83d4e072e527142516a0c3fff398d461a4afd304 (patch) | |
| tree | ad736ffd2cd60e40b1491787df21c21b773fdca4 | |
| parent | 95b36ca74ed1c1ec5c473302333b67d50643f48c (diff) | |
| download | dnspython-83d4e072e527142516a0c3fff398d461a4afd304.tar.gz | |
more (str,unicode) -> str conversion
| -rw-r--r-- | dns/dnssec.py | 6 | ||||
| -rw-r--r-- | dns/e164.py | 2 | ||||
| -rw-r--r-- | dns/query.py | 2 | ||||
| -rw-r--r-- | dns/rrset.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/dns/dnssec.py b/dns/dnssec.py index 9c1d5f3..7ba9b03 100644 --- 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 104aae9..bd846b6 100644 --- 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 c714491..5e01075 100644 --- 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 0ba7a3e..62ea66d 100644 --- 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: |