From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 09:58:09 +0000 (+0300)
Subject: catalog: fix bytes-to-strings comparisons when parsing headers on Py3
X-Git-Tag: v2.6.0~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f2be4127a301c0e3145a730bbc4d08afe78614d;p=thirdparty%2Fbabel.git

catalog: fix bytes-to-strings comparisons when parsing headers on Py3
---

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index f85bfb15..6d61a382 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -23,7 +23,7 @@ from babel.core import Locale, UnknownLocaleError
 from babel.dates import format_datetime
 from babel.messages.plurals import get_plural
 from babel.util import odict, distinct, LOCALTZ, FixedOffsetTimezone
-from babel._compat import string_types, number_types, PY2, cmp, text_type
+from babel._compat import string_types, number_types, PY2, cmp, text_type, force_text
 
 __all__ = ['Message', 'Catalog', 'TranslationError']
 
@@ -413,7 +413,8 @@ class Catalog(object):
 
     def _set_mime_headers(self, headers):
         for name, value in headers:
-            name = name.lower()
+            name = force_text(name.lower(), encoding=self.charset)
+            value = force_text(value, encoding=self.charset)
             if name == 'project-id-version':
                 parts = value.split(' ')
                 self.project = u' '.join(parts[:-1])