From 0d8e16c7adb3ac57d74e86bcf2311215ced1d034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 5 Aug 2003 06:19:47 +0000 Subject: [PATCH] Support trailing dots in DNS names. Fixes #782510. Will backport to 2.3. --- Lib/encodings/idna.py | 18 +++++++++++++++--- Lib/test/test_unicode.py | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py index 62aa4502f64..37462dbe115 100644 --- a/Lib/encodings/idna.py +++ b/Lib/encodings/idna.py @@ -150,10 +150,16 @@ class Codec(codecs.Codec): raise UnicodeError, "unsupported error handling "+errors result = [] - for label in dots.split(input): + labels = dots.split(input) + if labels and len(labels[-1])==0: + trailing_dot = '.' + del labels[-1] + else: + trailing_dot = '' + for label in labels: result.append(ToASCII(label)) # Join with U+002E - return ".".join(result), len(input) + return ".".join(result)+trailing_dot, len(input) def decode(self,input,errors='strict'): @@ -168,11 +174,17 @@ class Codec(codecs.Codec): unicode(input, "ascii") labels = input.split(".") + if labels and len(labels[-1]) == 0: + trailing_dot = u'.' + del labels[-1] + else: + trailing_dot = u'' + result = [] for label in labels: result.append(ToUnicode(label)) - return u".".join(result), len(input) + return u".".join(result)+trailing_dot, len(input) class StreamWriter(Codec,codecs.StreamWriter): pass diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 8e1f0b1b549..6e40b9faf31 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -524,6 +524,10 @@ class UnicodeTest( # * strict decoding testing for all of the # UTF8_ERROR cases in PyUnicode_DecodeUTF8 + def test_codecs_idna(self): + # Test whether trailing dot is preserved + self.assertEqual(u"www.python.org.".encode("idna"), "www.python.org.") + def test_codecs_errors(self): # Error handling (encoding) self.assertRaises(UnicodeError, u'Andr\202 x'.encode, 'ascii')