summaryrefslogtreecommitdiff
path: root/dns/zone.py
diff options
context:
space:
mode:
authorBob Halley <halley@nominum.com>2010-10-17 16:34:22 +0100
committerBob Halley <halley@nominum.com>2010-10-17 16:34:22 +0100
commitf437b7848886eee0d30a72e6e93cb377aae90e5a (patch)
tree482f1f80b29904805a0b5b2dafc3297d87aa2c00 /dns/zone.py
parent8e222ad86c4aea7adb4c165953852fccb5e939ba (diff)
downloaddnspython-f437b7848886eee0d30a72e6e93cb377aae90e5a.tar.gz
Allow unicode strings for rdtype and rdclass parameters
Diffstat (limited to 'dns/zone.py')
-rw-r--r--dns/zone.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/dns/zone.py b/dns/zone.py
index 93c157d..db5fd5d 100644
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -237,9 +237,9 @@ class Zone(object):
"""
name = self._validate_name(name)
- if isinstance(rdtype, str):
+ if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
- if isinstance(covers, str):
+ if isinstance(covers, (str, unicode)):
covers = dns.rdatatype.from_text(covers)
node = self.find_node(name, create)
return node.find_rdataset(self.rdclass, rdtype, covers, create)
@@ -300,9 +300,9 @@ class Zone(object):
"""
name = self._validate_name(name)
- if isinstance(rdtype, str):
+ if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
- if isinstance(covers, str):
+ if isinstance(covers, (str, unicode)):
covers = dns.rdatatype.from_text(covers)
node = self.get_node(name)
if not node is None:
@@ -363,9 +363,9 @@ class Zone(object):
"""
name = self._validate_name(name)
- if isinstance(rdtype, str):
+ if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
- if isinstance(covers, str):
+ if isinstance(covers, (str, unicode)):
covers = dns.rdatatype.from_text(covers)
rdataset = self.nodes[name].find_rdataset(self.rdclass, rdtype, covers)
rrset = dns.rrset.RRset(name, self.rdclass, rdtype, covers)
@@ -419,9 +419,9 @@ class Zone(object):
@type covers: int or string
"""
- if isinstance(rdtype, str):
+ if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
- if isinstance(covers, str):
+ if isinstance(covers, (str, unicode)):
covers = dns.rdatatype.from_text(covers)
for (name, node) in self.iteritems():
for rds in node:
@@ -442,9 +442,9 @@ class Zone(object):
@type covers: int or string
"""
- if isinstance(rdtype, str):
+ if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
- if isinstance(covers, str):
+ if isinstance(covers, (str, unicode)):
covers = dns.rdatatype.from_text(covers)
for (name, node) in self.iteritems():
for rds in node: