diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-19 17:56:33 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-19 17:56:33 (GMT) |
| commit | fd036451bf0e0ade8783e21df801abf7be96d020 (patch) | |
| tree | e70ff65a9e641d8e790bc091f0dc2507baf344ca /Lib/encodings/idna.py | |
| parent | 3ad7ba10a20827b24d4b1aa9dd49474db8affbdd (diff) | |
| download | cpython-fd036451bf0e0ade8783e21df801abf7be96d020.zip cpython-fd036451bf0e0ade8783e21df801abf7be96d020.tar.gz cpython-fd036451bf0e0ade8783e21df801abf7be96d020.tar.bz2 | |
#2834: Change re module semantics, so that str and bytes mixing is forbidden,
and str (unicode) patterns get full unicode matching by default. The re.ASCII
flag is also introduced to ask for ASCII matching instead.
Diffstat (limited to 'Lib/encodings/idna.py')
| -rw-r--r-- | Lib/encodings/idna.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py index c2ba1da..583bdf1 100644 --- a/Lib/encodings/idna.py +++ b/Lib/encodings/idna.py @@ -176,12 +176,10 @@ class Codec(codecs.Codec): return "", 0 # IDNA allows decoding to operate on Unicode strings, too. - if isinstance(input, bytes): - labels = dots.split(input) - else: - # Force to bytes + if not isinstance(input, bytes): + # XXX obviously wrong, see #3232 input = bytes(input) - labels = input.split(b".") + labels = input.split(b".") if labels and len(labels[-1]) == 0: trailing_dot = '.' |