From 268cacfd245ccd1cc59785fb84b329aab00f3ed2 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Thu, 21 Feb 2019 06:33:00 -0800 Subject: [PATCH] $GENERATE was not padding correctly given a pattern like ${0,3} it was using the index field (0) as the padding width, instead of the correct value 3. --- dns/zone.py | 1 - tests/test_generate.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dns/zone.py b/dns/zone.py index 5310a358..21731a6a 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -750,7 +750,6 @@ class _MasterReader(object): mod, sign, offset, width = g3.groups() if sign == '': sign = '+' - width = g3.groups()[2] base = 'd' if not (g1 or g2 or g3): diff --git a/tests/test_generate.py b/tests/test_generate.py index d7e5dbe0..ebd73027 100644 --- a/tests/test_generate.py +++ b/tests/test_generate.py @@ -527,11 +527,11 @@ class GenerateTestCase(unittest.TestCase): dns.rdata.from_text(dns.rdataclass.IN, dns.rdatatype.MX, '0 blaz.foo')), - (dns.name.from_text('prefix-27', None), 3600, + (dns.name.from_text('prefix-027', None), 3600, dns.rdata.from_text(dns.rdataclass.IN, dns.rdatatype.A, '10.0.0.27')), - (dns.name.from_text('prefix-28', None), 3600, + (dns.name.from_text('prefix-028', None), 3600, dns.rdata.from_text(dns.rdataclass.IN, dns.rdatatype.A, '10.0.0.28')), -- 2.47.3