diff options
| author | Bob Halley <halley@dnspython.org> | 2020-09-01 06:08:43 -0700 |
|---|---|---|
| committer | Bob Halley <halley@dnspython.org> | 2020-09-01 06:08:43 -0700 |
| commit | d33bc6bcb6572e23ff3bfb7091a7a1046bac7e60 (patch) | |
| tree | 347490fc14527bd8a652b41d74b80dad30f92324 | |
| parent | 674cdfc8ba30e12810645eee4531c943518abc16 (diff) | |
| download | dnspython-d33bc6bcb6572e23ff3bfb7091a7a1046bac7e60.tar.gz | |
check for TTL type errors in rdataset/rrset from_text; allow text-form TTLs there.
| -rw-r--r-- | dns/rdataset.py | 4 | ||||
| -rw-r--r-- | dns/ttl.py | 9 | ||||
| -rw-r--r-- | tests/test_rdata.py | 12 |
3 files changed, 23 insertions, 2 deletions
diff --git a/dns/rdataset.py b/dns/rdataset.py index 2a42e42..2e3b4d4 100644 --- a/dns/rdataset.py +++ b/dns/rdataset.py @@ -80,9 +80,9 @@ class Rdataset(dns.set.Set): TTL or the specified TTL. If the set contains no rdatas, set the TTL to the specified TTL. - *ttl*, an ``int``. + *ttl*, an ``int`` or ``str``. """ - + ttl = dns.ttl.make(ttl) if len(self) == 0: self.ttl = ttl elif ttl < self.ttl: @@ -73,3 +73,12 @@ def from_text(text): if total < 0 or total > MAX_TTL: raise BadTTL("TTL should be between 0 and 2^31 - 1 (inclusive)") return total + + +def make(value): + if isinstance(value, int): + return value + elif isinstance(value, str): + return dns.ttl.from_text(value) + else: + raise ValueError('cannot convert value to TTL') diff --git a/tests/test_rdata.py b/tests/test_rdata.py index 4071403..66ed67c 100644 --- a/tests/test_rdata.py +++ b/tests/test_rdata.py @@ -35,6 +35,7 @@ from dns.rdtypes.ANY.GPOS import GPOS import dns.rdtypes.ANY.RRSIG import dns.rdtypes.util import dns.tokenizer +import dns.ttl import dns.wire import tests.stxt_module @@ -743,5 +744,16 @@ class UtilTestCase(unittest.TestCase): dns.rdata.from_text(dns.rdataclass.IN, dns.rdatatype.MX, r'\# 4 000aC000') + def test_rdataset_ttl_conversion(self): + rds1 = dns.rdataset.from_text('in', 'a', 300, '10.0.0.1') + self.assertEqual(rds1.ttl, 300) + rds2 = dns.rdataset.from_text('in', 'a', '5m', '10.0.0.1') + self.assertEqual(rds2.ttl, 300) + with self.assertRaises(ValueError): + dns.rdataset.from_text('in', 'a', 1.6, '10.0.0.1') + with self.assertRaises(dns.ttl.BadTTL): + dns.rdataset.from_text('in', 'a', '10.0.0.1', '10.0.0.2') + + if __name__ == '__main__': unittest.main() |