From 9600f93db6038ef6d5a1254295bac61e96fa56a2 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 29 Aug 2007 03:08:55 +0000 Subject: [PATCH] Make gettext work with strict str/bytes. --- Lib/gettext.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/gettext.py b/Lib/gettext.py index d3f853829d..37ebf8a82b 100644 --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -292,7 +292,7 @@ class GNUTranslations(NullTranslations): if mlen == 0: # Catalog description lastk = k = None - for b_item in tmsg.split(os.linesep): + for b_item in tmsg.split(os.linesep.encode("ascii")): item = str(b_item).strip() if not item: continue @@ -321,8 +321,8 @@ class GNUTranslations(NullTranslations): # if the Unicode conversion fails. if b'\x00' in msg: # Plural forms - msgid1, msgid2 = msg.split('\x00') - tmsg = tmsg.split('\x00') + msgid1, msgid2 = msg.split(b'\x00') + tmsg = tmsg.split(b'\x00') if self._charset: msgid1 = str(msgid1, self._charset) tmsg = [str(x, self._charset) for x in tmsg] -- 2.50.0