disallow types-by-number in NSEC; update ChangeLog and README

Original author: Bob Halley <halley@dnspython.org>
Date: 2004-07-31 21:32:06

diff --git a/ChangeLog b/ChangeLog
index 25036a1fbe901a33f3e86848222c4fad6cd56b89..14b81fa354eec57897298c68cc9c941d03381856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-07-31  Bob Halley  <halley@dnspython.org>
+
+       * dns/rdtypes/ANY/NSEC.py (NSEC.from_text): The NSEC text format
+       does not allow specifying types by number, so we shouldn't either.
+
+       * dns/renderer.py: the renderer module didn't import random,
+       causing an exception to be raised if a query id wasn't provided
+       when a Renderer was created.
+
+       * dns/resolver.py (Resolver.query): the resolver wasn't catching
+       dns.exception.Timeout, so a timeout erroneously caused the whole
+       resolution to fail instead of just going on to the next server.
+
 2004-06-16  Bob Halley  <halley@dnspython.org>
 
        * dns/rdtypes/ANY/LOC.py (LOC.from_text): LOC milliseconds values

diff --git a/README b/README
index 2fc4c6011100c584a8ff61240dcc087fda51308c..691fac9c916147c10f8d886b0a0bfb316c5038f9 100644 (file)
--- a/README
+++ b/README
@@ -26,6 +26,18 @@ This is dnspython 1.3.2.
 
 New since 1.3.1:
 
+       The NSEC format doesn't allow specifying types by number, so
+       we shouldn't either.  (Using the unknown type format is still
+       OK though.)
+
+       The resolver wasn't catching dns.exception.Timeout, so a timeout
+       erroneously caused the whole resolution to fail instead of just
+       going on to the next server.
+
+       The renderer module didn't import random, causing an exception
+       to be raised if a query id wasn't provided when a Renderer was
+       created.
+
         The conversion of LOC milliseconds values from text to binary was
        incorrect if the length of the milliseconds string was not 3.
 

diff --git a/dns/rdtypes/ANY/NSEC.py b/dns/rdtypes/ANY/NSEC.py
index 036b5e7d58049751be43b6ca3d34d8bebc3fe641..c4f1d2f64b0a032549c227953d280249ee112b4f 100644 (file)
--- a/dns/rdtypes/ANY/NSEC.py
+++ b/dns/rdtypes/ANY/NSEC.py
@@ -57,10 +57,7 @@ class NSEC(dns.rdata.Rdata):
             (ttype, value) = tok.get()
             if ttype == dns.tokenizer.EOL or ttype == dns.tokenizer.EOF:
                 break
-            if value.isdigit():
-                nrdtype = int(value)
-            else:
-                nrdtype = dns.rdatatype.from_text(value)
+            nrdtype = dns.rdatatype.from_text(value)
             if nrdtype == 0:
                 raise dns.exception.SyntaxError, "NSEC with bit 0"
             if nrdtype > 65535: