diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-09 14:53:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-10 03:04:06 +0100 |
| commit | 75ef8f1dd27f4985b3d705e7681a9218ad513c84 (patch) | |
| tree | c28f415ff0e15bc40aa07f191afe0238d45ae598 /lib/dnspython/dns/zone.py | |
| parent | 91438920b465ec7455dd1cd700bbe8ec5050b3f9 (diff) | |
| download | samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.tar.gz samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.tar.bz2 samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.zip | |
dnspython: Update to newer upstream snapshot.
Diffstat (limited to 'lib/dnspython/dns/zone.py')
| -rw-r--r-- | lib/dnspython/dns/zone.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/dnspython/dns/zone.py b/lib/dnspython/dns/zone.py index 93c157d8f0..db5fd5df85 100644 --- a/lib/dnspython/dns/zone.py +++ b/lib/dnspython/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: |