Kaydet (Commit) 9600f93d authored tarafından Guido van Rossum's avatar Guido van Rossum

Make gettext work with strict str/bytes.

üst 83800a65
...@@ -292,7 +292,7 @@ class GNUTranslations(NullTranslations): ...@@ -292,7 +292,7 @@ class GNUTranslations(NullTranslations):
if mlen == 0: if mlen == 0:
# Catalog description # Catalog description
lastk = k = None 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() item = str(b_item).strip()
if not item: if not item:
continue continue
...@@ -321,8 +321,8 @@ class GNUTranslations(NullTranslations): ...@@ -321,8 +321,8 @@ class GNUTranslations(NullTranslations):
# if the Unicode conversion fails. # if the Unicode conversion fails.
if b'\x00' in msg: if b'\x00' in msg:
# Plural forms # Plural forms
msgid1, msgid2 = msg.split('\x00') msgid1, msgid2 = msg.split(b'\x00')
tmsg = tmsg.split('\x00') tmsg = tmsg.split(b'\x00')
if self._charset: if self._charset:
msgid1 = str(msgid1, self._charset) msgid1 = str(msgid1, self._charset)
tmsg = [str(x, self._charset) for x in tmsg] tmsg = [str(x, self._charset) for x in tmsg]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment