From: sergey aleksandrov <saleksandrov@scalaxy.ru>
Date: Fri, 8 Jun 2012 05:16:21 +0000 (+0400)
Subject: python3k to_unicode fix in locale.load_translations
X-Git-Tag: v2.4.0~70^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b7575849764fb33ccbc514baea1de70f6294a6a;p=thirdparty%2Ftornado.git

python3k to_unicode fix in locale.load_translations
---

diff --git a/tornado/locale.py b/tornado/locale.py
index 415b3440d..1e361d461 100644
--- a/tornado/locale.py
+++ b/tornado/locale.py
@@ -47,6 +47,8 @@ import logging
 import os
 import re
 
+from tornado import escape
+
 _default_locale = "en_US"
 _translations = {}
 _supported_locales = frozenset([_default_locale])
@@ -124,7 +126,7 @@ def load_translations(directory):
         for i, row in enumerate(csv.reader(f)):
             if not row or len(row) < 2:
                 continue
-            row = [c.decode("utf-8").strip() for c in row]
+            row = [escape.to_unicode(c).strip() for c in row]
             english, translation = row[:2]
             if len(row) > 2:
                 plural = row[2] or "unknown"