diff options
| author | Brian Wellington <bwelling@xbill.org> | 2020-05-18 10:25:11 -0700 |
|---|---|---|
| committer | Brian Wellington <bwelling@xbill.org> | 2020-05-18 10:25:11 -0700 |
| commit | 65e107bd0d43a90b0d0d016b594f6587e2875132 (patch) | |
| tree | 6ee7d6a0045fdd306efb1f3d45b22b52788c9c41 /dns/zone.py | |
| parent | bf4c6c653961121cd3a5ec0c9ff0956357d11e7e (diff) | |
| download | dnspython-65e107bd0d43a90b0d0d016b594f6587e2875132.tar.gz | |
Start converting rdatatype/rdataclass to enum.
Diffstat (limited to 'dns/zone.py')
| -rw-r--r-- | dns/zone.py | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/dns/zone.py b/dns/zone.py index be7333c..a75b6b2 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -270,10 +270,9 @@ class Zone(object): """ name = self._validate_name(name) - if isinstance(rdtype, str): - rdtype = dns.rdatatype.from_text(rdtype) - if isinstance(covers, str): - covers = dns.rdatatype.from_text(covers) + rdtype = dns.rdatatype.to_enum(rdtype) + if covers is not None: + covers = dns.rdatatype.to_enum(covers) node = self.find_node(name, create) return node.find_rdataset(self.rdclass, rdtype, covers, create) @@ -349,10 +348,9 @@ class Zone(object): """ name = self._validate_name(name) - if isinstance(rdtype, str): - rdtype = dns.rdatatype.from_text(rdtype) - if isinstance(covers, str): - covers = dns.rdatatype.from_text(covers) + rdtype = dns.rdatatype.to_enum(rdtype) + if covers is not None: + covers = dns.rdatatype.to_enum(covers) node = self.get_node(name) if node is not None: node.delete_rdataset(self.rdclass, rdtype, covers) @@ -423,10 +421,9 @@ class Zone(object): """ name = self._validate_name(name) - if isinstance(rdtype, str): - rdtype = dns.rdatatype.from_text(rdtype) - if isinstance(covers, str): - covers = dns.rdatatype.from_text(covers) + rdtype = dns.rdatatype.to_enum(rdtype) + if covers is not None: + covers = dns.rdatatype.to_enum(covers) rdataset = self.nodes[name].find_rdataset(self.rdclass, rdtype, covers) rrset = dns.rrset.RRset(name, self.rdclass, rdtype, covers) rrset.update(rdataset) @@ -496,10 +493,9 @@ class Zone(object): RRSIG rdataset. """ - if isinstance(rdtype, str): - rdtype = dns.rdatatype.from_text(rdtype) - if isinstance(covers, str): - covers = dns.rdatatype.from_text(covers) + rdtype = dns.rdatatype.to_enum(rdtype) + if covers is not None: + covers = dns.rdatatype.to_enum(covers) for (name, node) in self.items(): for rds in node: if rdtype == dns.rdatatype.ANY or \ @@ -526,10 +522,9 @@ class Zone(object): RRSIG rdataset. """ - if isinstance(rdtype, str): - rdtype = dns.rdatatype.from_text(rdtype) - if isinstance(covers, str): - covers = dns.rdatatype.from_text(covers) + rdtype = dns.rdatatype.to_enum(rdtype) + if covers is not None: + covers = dns.rdatatype.to_enum(covers) for (name, node) in self.items(): for rds in node: if rdtype == dns.rdatatype.ANY or \ |