- Fix #745: unbound.py - idn2dname throws UnicodeError when idnname

  contains trailing dot. (Fix from Ralph)

git-svn-id: file:///svn/unbound/trunk@3644 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 29a172029ffb8c2742543051ace9f4ef02ae7e19..9184d1411638b6929bfa0b44023ce6782c0b7930 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
        - 1.5.8 release tag
        - trunk contains 1.5.9 in development.
        - iana portlist update.
+       - Fix #745: unbound.py - idn2dname throws UnicodeError when idnname
+         contains trailing dot.
 
 24 February 2016: Wouter
        - Fix OpenBSD asynclook lock free that gets used later (fix test code).

diff --git a/libunbound/python/libunbound.i b/libunbound/python/libunbound.i
index 50a9b67acf8bb93e710857e8f4b51dcd4852b651..84a536929421df9a3ba1d2adfb0c4e5bbe91429b 100644 (file)
--- a/libunbound/python/libunbound.i
+++ b/libunbound/python/libunbound.i
@@ -945,7 +945,7 @@ int _ub_resolve_async(struct ub_ctx* ctx, char* name, int rrtype, int rrclass, v
            :param idnname: (unicode string) IDN name
            :returns: (string) domain name
         """
-        return '.'.join([encodings.idna.ToASCII(a) for a in idnname.split('.')])
+        return '.'.join([encodings.idna.ToASCII(a) if a else '' for a in idnname.split('.')])
 
     def dname2idn(name):
         """Converts canonic domain name in IDN format to unicode string