summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--dns/ipv6.py5
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 27a54ee..8091165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-06 Bob Halley <halley@dnspython.org>
+
+ * dns/ipv6.py (inet_aton): We could raise an exception other than
+ dns.exception.SyntaxError in some cases.
+
+ * dns/tsig.py: Raise an exception when the peer has set a non-zero
+ TSIG error.
+
2007-11-25 Bob Halley <halley@dnspython.org
* (Version 1.6.0 released)
diff --git a/dns/ipv6.py b/dns/ipv6.py
index 50780b6..76540d9 100644
--- a/dns/ipv6.py
+++ b/dns/ipv6.py
@@ -157,4 +157,7 @@ def inet_aton(text):
#
# Finally we can go to binary.
#
- return text.decode('hex_codec')
+ try:
+ return text.decode('hex_codec')
+ except TypeError:
+ raise dns.exception.SyntaxError