Merge branch 'master' into 2.7-dev

Author: kjd

HISTORY.rst

@@ -3,14 +3,6 @@
 History
 -------
 
-2.7 (2018-03-XX)
-++++++++++++++++
-
-- Update to Unicode 10.0.0.
-- No longer accepts dot-prefixed domains (e.g. ".example') as valid.
-  This is to be more conformant with the UTS 46 spec. Users should
-  strip dot prefixes from domains before processing.
-
 2.6 (2017-08-08)
 ++++++++++++++++
 

idna/core.py

@@ -352,17 +352,15 @@ def encode(s, strict=False, uts46=False, std3_rules=False, transitional=False):
         labels = s.split('.')
     else:
         labels = _unicode_dots_re.split(s)
-    if not labels or labels == ['']:
+    while labels and not labels[0]:
+        del labels[0]
+    if not labels:
         raise IDNAError('Empty domain')
     if labels[-1] == '':
         del labels[-1]
         trailing_dot = True
     for label in labels:
-        s = alabel(label)
-        if s:
-            result.append(s)
-        else:
-            raise IDNAError('Empty label')
+        result.append(alabel(label))
     if trailing_dot:
         result.append(b'')
     s = b'.'.join(result)
@@ -383,17 +381,15 @@ def decode(s, strict=False, uts46=False, std3_rules=False):
         labels = _unicode_dots_re.split(s)
     else:
         labels = s.split(u'.')
-    if not labels or labels == ['']:
+    while labels and not labels[0]:
+        del labels[0]
+    if not labels:
         raise IDNAError('Empty domain')
     if not labels[-1]:
         del labels[-1]
         trailing_dot = True
     for label in labels:
-        s = ulabel(label)
-        if s:
-            result.append(s)
-        else:
-            raise IDNAError('Empty label')
+        result.append(ulabel(label))
     if trailing_dot:
         result.append(u'')
     return u'.'.join(result)