From 9f5e77f686a974b837da6eb92cec741fcbb33603 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Fri, 20 Jun 2014 12:53:06 +0200 Subject: [PATCH] Fix handle python-dns UnicodeError Reviewed-By: Jan Cholasta --- ipapython/dnsutil.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py index 9c91578a8..3602d22cd 100644 --- a/ipapython/dnsutil.py +++ b/ipapython/dnsutil.py @@ -18,6 +18,7 @@ # import dns.name +import dns.exception import copy @@ -35,10 +36,10 @@ class DNSName(dns.name.Name): labels = labels.labels try: super(DNSName, self).__init__(labels) - except UnicodeError: - #dnspython bug, punycoded label longer than 63 returns UnicodeError - #instead of LabelTooLong - raise dns.name.LabelTooLong() + except UnicodeError, e: + # dnspython bug, an invalid domain name returns the UnicodeError + # instead of a dns.exception + raise dns.exception.SyntaxError(e) def __nonzero__(self): #dns.name.from_text('@') is represented like empty tuple