Remove dns.rdata.choose_relativity().

This method changes rdata in place, so prevents rdata from becoming
immutable.  There are no in-tree users, and if there are out of tree
users, they are rate and hard to find.

diff --git a/dns/rdata.py b/dns/rdata.py
index 640f731559119d1a23af380cd983e2f4a48eb9a6..b63f50a0587bb820cdb387c7a5a9e79f737bcf54 100644 (file)
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -253,11 +253,6 @@ class Rdata(object):
     def from_wire(cls, rdclass, rdtype, wire, current, rdlen, origin=None):
         raise NotImplementedError
 
-    def choose_relativity(self, origin=None, relativize=True):
-        """Convert any domain names in the rdata to the specified
-        relativization.
-        """
-
 class GenericRdata(Rdata):
 
     """Generic Rdata Class

diff --git a/dns/rdtypes/ANY/HIP.py b/dns/rdtypes/ANY/HIP.py
index 0b3dfb0de1b4d5904552c649514ac7e39d83a4ac..f76a560cd68659af5fdd5f49c8ebec413dc5b442 100644 (file)
--- a/dns/rdtypes/ANY/HIP.py
+++ b/dns/rdtypes/ANY/HIP.py
@@ -107,10 +107,3 @@ class HIP(dns.rdata.Rdata):
                 server = server.relativize(origin)
             servers.append(server)
         return cls(rdclass, rdtype, hit, algorithm, key, servers)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        servers = []
-        for server in self.servers:
-            server = server.choose_relativity(origin, relativize)
-            servers.append(server)
-        self.servers = servers

diff --git a/dns/rdtypes/ANY/NSEC.py b/dns/rdtypes/ANY/NSEC.py
index 2b7bc6c4bc0027b5549b77d45df94228cc82d683..2ff7bf2fac67694b9cefa764c73aed2885a3437a 100644 (file)
--- a/dns/rdtypes/ANY/NSEC.py
+++ b/dns/rdtypes/ANY/NSEC.py
@@ -121,6 +121,3 @@ class NSEC(dns.rdata.Rdata):
         if origin is not None:
             next = next.relativize(origin)
         return cls(rdclass, rdtype, next, windows)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.next = self.next.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/ANY/RP.py b/dns/rdtypes/ANY/RP.py
index 1c8afe232a04a84219d139c214b08a4df04b7fcc..ea4a9d9f82cc30a68c9af726244c18886d7354c6 100644 (file)
--- a/dns/rdtypes/ANY/RP.py
+++ b/dns/rdtypes/ANY/RP.py
@@ -75,7 +75,3 @@ class RP(dns.rdata.Rdata):
             mbox = mbox.relativize(origin)
             txt = txt.relativize(origin)
         return cls(rdclass, rdtype, mbox, txt)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.mbox = self.mbox.choose_relativity(origin, relativize)
-        self.txt = self.txt.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/ANY/RRSIG.py b/dns/rdtypes/ANY/RRSIG.py
index cef60007f36ac2694b2cb309823c708de556e88e..57c40479782bb4f2ad20580b64d79434e1221028 100644 (file)
--- a/dns/rdtypes/ANY/RRSIG.py
+++ b/dns/rdtypes/ANY/RRSIG.py
@@ -155,6 +155,3 @@ class RRSIG(dns.rdata.Rdata):
         return cls(rdclass, rdtype, header[0], header[1], header[2],
                    header[3], header[4], header[5], header[6], signer,
                    signature)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.signer = self.signer.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/ANY/SOA.py b/dns/rdtypes/ANY/SOA.py
index 58a65f64dad313feb206625dd0b9956dbdb13ff3..b3c32080151fdafb5a32570922d3889fd00218f9 100644 (file)
--- a/dns/rdtypes/ANY/SOA.py
+++ b/dns/rdtypes/ANY/SOA.py
@@ -109,7 +109,3 @@ class SOA(dns.rdata.Rdata):
         return cls(rdclass, rdtype, mname, rname,
                    five_ints[0], five_ints[1], five_ints[2], five_ints[3],
                    five_ints[4])
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.mname = self.mname.choose_relativity(origin, relativize)
-        self.rname = self.rname.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/CH/A.py b/dns/rdtypes/CH/A.py
index 34d432c8054864f643e7c92fa78c8046751393f2..3373d6976d2330f433a3ae5f68df0125d472bb72 100644 (file)
--- a/dns/rdtypes/CH/A.py
+++ b/dns/rdtypes/CH/A.py
@@ -65,6 +65,3 @@ class A(dns.rdtypes.mxbase.MXBase):
         if origin is not None:
             domain = domain.relativize(origin)
         return cls(rdclass, rdtype, address, domain)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.domain = self.domain.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/IN/IPSECKEY.py b/dns/rdtypes/IN/IPSECKEY.py
index 4a81d9814a64ec9afc545b236dd0b9f3cf0ef213..b04aaeef2367f0380f7e92a53fcb0182899bc890 100644 (file)
--- a/dns/rdtypes/IN/IPSECKEY.py
+++ b/dns/rdtypes/IN/IPSECKEY.py
@@ -151,7 +151,3 @@ class IPSECKEY(dns.rdata.Rdata):
             gateway = gateway.relativize(origin)
         return cls(rdclass, rdtype, header[0], gateway_type, header[2],
                    gateway, key)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        if self.gateway_type == 3:
-            self.gateway = self.gateway.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/IN/NAPTR.py b/dns/rdtypes/IN/NAPTR.py
index 69c988cdad026db613d923f945b8e61350e4e07e..dba0d366e7f7e176c6f95b9656312aa6a4e5359a 100644 (file)
--- a/dns/rdtypes/IN/NAPTR.py
+++ b/dns/rdtypes/IN/NAPTR.py
@@ -120,7 +120,3 @@ class NAPTR(dns.rdata.Rdata):
             replacement = replacement.relativize(origin)
         return cls(rdclass, rdtype, order, preference, strings[0], strings[1],
                    strings[2], replacement)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.replacement = self.replacement.choose_relativity(origin,
-                                                              relativize)

diff --git a/dns/rdtypes/IN/PX.py b/dns/rdtypes/IN/PX.py
index 86f8613815a39332aad59815d726f173ceff20a5..e664240ab8c4de8d3879e4965a86ae498bce39be 100644 (file)
--- a/dns/rdtypes/IN/PX.py
+++ b/dns/rdtypes/IN/PX.py
@@ -82,7 +82,3 @@ class PX(dns.rdata.Rdata):
         if origin is not None:
             mapx400 = mapx400.relativize(origin)
         return cls(rdclass, rdtype, preference, map822, mapx400)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.map822 = self.map822.choose_relativity(origin, relativize)
-        self.mapx400 = self.mapx400.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/IN/SRV.py b/dns/rdtypes/IN/SRV.py
index 87c047116b3627dbdf7d2450423a73e17bf3a8ee..b197db61445b231e019f4bc54ed5a82d4df58c6c 100644 (file)
--- a/dns/rdtypes/IN/SRV.py
+++ b/dns/rdtypes/IN/SRV.py
@@ -78,6 +78,3 @@ class SRV(dns.rdata.Rdata):
         if origin is not None:
             target = target.relativize(origin)
         return cls(rdclass, rdtype, priority, weight, port, target)
-
-    def choose_relativity(self, origin=None, relativize=True):
-        self.target = self.target.choose_relativity(origin, relativize)

diff --git a/dns/rdtypes/mxbase.py b/dns/rdtypes/mxbase.py
index 7ed97f57da2adbc93de026552ce5a413bbdf0d79..042f3251c23bc040c7105dbd4913ef5f4c838373 100644 (file)
--- a/dns/rdtypes/mxbase.py
+++ b/dns/rdtypes/mxbase.py
@@ -75,9 +75,6 @@ class MXBase(dns.rdata.Rdata):
             exchange = exchange.relativize(origin)
         return cls(rdclass, rdtype, preference, exchange)
 
-    def choose_relativity(self, origin=None, relativize=True):
-        self.exchange = self.exchange.choose_relativity(origin, relativize)
-
 
 class UncompressedMX(MXBase):
 

diff --git a/dns/rdtypes/nsbase.py b/dns/rdtypes/nsbase.py
index b55a7f2e0097749b1dfc714d4a138ec4f5724471..89616d06f1c9d2d3ff6e83fb691f5ae11635ea05 100644 (file)
--- a/dns/rdtypes/nsbase.py
+++ b/dns/rdtypes/nsbase.py
@@ -64,9 +64,6 @@ class NSBase(dns.rdata.Rdata):
             target = target.relativize(origin)
         return cls(rdclass, rdtype, target)
 
-    def choose_relativity(self, origin=None, relativize=True):
-        self.target = self.target.choose_relativity(origin, relativize)
-
 
 class UncompressedNS(NSBase):