pep8

tornadoweb · Jan 19, 2013 · 564a5ad · 564a5ad
1 parent 19933ee
commit 564a5ad
Showing 1 changed file with 50 additions and 26 deletions.
diff --git a/cyclone/locale.py b/cyclone/locale.py
@@ -81,7 +81,8 @@ def set_default_locale(code):
     global _default_locale
     global _supported_locales
     _default_locale = code
-    _supported_locales = frozenset(_translations.keys() + [_default_locale])
+    _supported_locales = frozenset(list(_translations.keys()) +
+                                    [_default_locale])
 
 
 def load_translations(directory):
@@ -119,7 +120,7 @@ def load_translations(directory):
             continue
         locale, extension = path.split(".")
         if not re.match("[a-z]+(_[A-Z]+)?$", locale):
-            log.msg("Unrecognized locale %r (path: %s)" % \
+            log.msg("Unrecognized locale %r (path: %s)" %
                     (locale, os.path.join(directory, path)))
             continue
         f = open(os.path.join(directory, path), "r")
@@ -134,12 +135,13 @@ def load_translations(directory):
             else:
                 plural = "unknown"
             if plural not in ("plural", "singular", "unknown"):
-                log.msg("Unrecognized plural indicator %r in %s line %d" % \
+                log.msg("Unrecognized plural indicator %r in %s line %d" %
                         (plural, path, i + 1))
                 continue
             _translations[locale].setdefault(plural, {})[english] = translation
         f.close()
-    _supported_locales = frozenset(_translations.keys() + [_default_locale])
+    _supported_locales = frozenset(list(_translations.keys()) +
+                                        [_default_locale])
     log.msg("Supported locales: %s" % sorted(_supported_locales))
 
 
@@ -182,7 +184,8 @@ def load_gettext_translations(directory, domain):
             print("Cannot load translation for '%s': %s" % (lang, str(e)))
             #log.msg("Cannot load translation for '%s': %s" % (lang, str(e)))
             continue
-    _supported_locales = frozenset(_translations.keys() + [_default_locale])
+    _supported_locales = frozenset(list(_translations.keys()) +
+                                    [_default_locale])
     _use_gettext = True
     reactor.callWhenRunning(log.msg,
                         "Supported locales: %s" % sorted(_supported_locales))
@@ -430,30 +433,38 @@ def translate(self, message, plural_message=None, count=None):
 LOCALE_NAMES = {
     "af_ZA": {"name_en": u"Afrikaans", "name": u"Afrikaans"},
     "am_ET": {"name_en": u"Amharic", "name": u'\u12a0\u121b\u122d\u129b'},
-    "ar_AR": {"name_en": u"Arabic", "name": u"\u0627\u0644\u0639\u0631\u0628\u064a\u0629"},
-    "bg_BG": {"name_en": u"Bulgarian", "name": u"\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"},
-    "bn_IN": {"name_en": u"Bengali", "name": u"\u09ac\u09be\u0982\u09b2\u09be"},
+    "ar_AR": {"name_en": u"Arabic",
+    "name": u"\u0627\u0644\u0639\u0631\u0628\u064a\u0629"},
+    "bg_BG": {"name_en": u"Bulgarian",
+    "name": u"\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"},
+    "bn_IN": {"name_en": u"Bengali",
+    "name": u"\u09ac\u09be\u0982\u09b2\u09be"},
     "bs_BA": {"name_en": u"Bosnian", "name": u"Bosanski"},
     "ca_ES": {"name_en": u"Catalan", "name": u"Catal\xe0"},
     "cs_CZ": {"name_en": u"Czech", "name": u"\u010ce\u0161tina"},
     "cy_GB": {"name_en": u"Welsh", "name": u"Cymraeg"},
     "da_DK": {"name_en": u"Danish", "name": u"Dansk"},
     "de_DE": {"name_en": u"German", "name": u"Deutsch"},
-    "el_GR": {"name_en": u"Greek", "name": u"\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"},
+    "el_GR": {"name_en": u"Greek",
+    "name": u"\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"},
     "en_GB": {"name_en": u"English (UK)", "name": u"English (UK)"},
     "en_US": {"name_en": u"English (US)", "name": u"English (US)"},
-    "es_ES": {"name_en": u"Spanish (Spain)", "name": u"Espa\xf1ol (Espa\xf1a)"},
+    "es_ES": {"name_en": u"Spanish (Spain)",
+    "name": u"Espa\xf1ol (Espa\xf1a)"},
     "es_LA": {"name_en": u"Spanish", "name": u"Espa\xf1ol"},
     "et_EE": {"name_en": u"Estonian", "name": u"Eesti"},
     "eu_ES": {"name_en": u"Basque", "name": u"Euskara"},
-    "fa_IR": {"name_en": u"Persian", "name": u"\u0641\u0627\u0631\u0633\u06cc"},
+    "fa_IR": {"name_en": u"Persian",
+    "name": u"\u0641\u0627\u0631\u0633\u06cc"},
     "fi_FI": {"name_en": u"Finnish", "name": u"Suomi"},
     "fr_CA": {"name_en": u"French (Canada)", "name": u"Fran\xe7ais (Canada)"},
     "fr_FR": {"name_en": u"French", "name": u"Fran\xe7ais"},
     "ga_IE": {"name_en": u"Irish", "name": u"Gaeilge"},
     "gl_ES": {"name_en": u"Galician", "name": u"Galego"},
-    "he_IL": {"name_en": u"Hebrew", "name": u"\u05e2\u05d1\u05e8\u05d9\u05ea"},
-    "hi_IN": {"name_en": u"Hindi", "name": u"\u0939\u093f\u0928\u094d\u0926\u0940"},
+    "he_IL": {"name_en": u"Hebrew",
+    "name": u"\u05e2\u05d1\u05e8\u05d9\u05ea"},
+    "hi_IN": {"name_en": u"Hindi",
+    "name": u"\u0939\u093f\u0928\u094d\u0926\u0940"},
     "hr_HR": {"name_en": u"Croatian", "name": u"Hrvatski"},
     "hu_HU": {"name_en": u"Hungarian", "name": u"Magyar"},
     "id_ID": {"name_en": u"Indonesian", "name": u"Bahasa Indonesia"},
@@ -463,31 +474,44 @@ def translate(self, message, plural_message=None, count=None):
     "ko_KR": {"name_en": u"Korean", "name": u"\ud55c\uad6d\uc5b4"},
     "lt_LT": {"name_en": u"Lithuanian", "name": u"Lietuvi\u0173"},
     "lv_LV": {"name_en": u"Latvian", "name": u"Latvie\u0161u"},
-    "mk_MK": {"name_en": u"Macedonian", "name": u"\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"},
-    "ml_IN": {"name_en": u"Malayalam", "name": u"\u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02"},
+    "mk_MK": {"name_en": u"Macedonian",
+    "name": u"\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"},
+    "ml_IN": {"name_en": u"Malayalam",
+    "name": u"\u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02"},
     "ms_MY": {"name_en": u"Malay", "name": u"Bahasa Melayu"},
     "nb_NO": {"name_en": u"Norwegian (bokmal)", "name": u"Norsk (bokm\xe5l)"},
     "nl_NL": {"name_en": u"Dutch", "name": u"Nederlands"},
     "nn_NO": {"name_en": u"Norwegian (nynorsk)", "name": u"Norsk (nynorsk)"},
-    "pa_IN": {"name_en": u"Punjabi", "name": u"\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40"},
+    "pa_IN": {"name_en": u"Punjabi",
+    "name": u"\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40"},
     "pl_PL": {"name_en": u"Polish", "name": u"Polski"},
-    "pt_BR": {"name_en": u"Portuguese (Brazil)", "name": u"Portugu\xeas (Brasil)"},
-    "pt_PT": {"name_en": u"Portuguese (Portugal)", "name": u"Portugu\xeas (Portugal)"},
+    "pt_BR": {"name_en": u"Portuguese (Brazil)",
+    "name": u"Portugu\xeas (Brasil)"},
+    "pt_PT": {"name_en": u"Portuguese (Portugal)",
+    "name": u"Portugu\xeas (Portugal)"},
     "ro_RO": {"name_en": u"Romanian", "name": u"Rom\xe2n\u0103"},
-    "ru_RU": {"name_en": u"Russian", "name": u"\u0420\u0443\u0441\u0441\u043a\u0438\u0439"},
+    "ru_RU": {"name_en": u"Russian",
+    "name": u"\u0420\u0443\u0441\u0441\u043a\u0438\u0439"},
     "sk_SK": {"name_en": u"Slovak", "name": u"Sloven\u010dina"},
     "sl_SI": {"name_en": u"Slovenian", "name": u"Sloven\u0161\u010dina"},
     "sq_AL": {"name_en": u"Albanian", "name": u"Shqip"},
-    "sr_RS": {"name_en": u"Serbian", "name": u"\u0421\u0440\u043f\u0441\u043a\u0438"},
+    "sr_RS": {"name_en": u"Serbian",
+    "name": u"\u0421\u0440\u043f\u0441\u043a\u0438"},
     "sv_SE": {"name_en": u"Swedish", "name": u"Svenska"},
     "sw_KE": {"name_en": u"Swahili", "name": u"Kiswahili"},
-    "ta_IN": {"name_en": u"Tamil", "name": u"\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"},
-    "te_IN": {"name_en": u"Telugu", "name": u"\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41"},
-    "th_TH": {"name_en": u"Thai", "name": u"\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22"},
+    "ta_IN": {"name_en": u"Tamil",
+    "name": u"\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"},
+    "te_IN": {"name_en": u"Telugu",
+    "name": u"\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41"},
+    "th_TH": {"name_en": u"Thai",
+    "name": u"\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22"},
     "tl_PH": {"name_en": u"Filipino", "name": u"Filipino"},
     "tr_TR": {"name_en": u"Turkish", "name": u"T\xfcrk\xe7e"},
-    "uk_UA": {"name_en": u"Ukraini ", "name": u"\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"},
+    "uk_UA": {"name_en": u"Ukraini ",
+    "name": u"\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"},
     "vi_VN": {"name_en": u"Vietnamese", "name": u"Ti\u1ebfng Vi\u1ec7t"},
-    "zh_CN": {"name_en": u"Chinese (Simplified)", "name": u"\u4e2d\u6587(\u7b80\u4f53)"},
-    "zh_TW": {"name_en": u"Chinese (Traditional)", "name": u"\u4e2d\u6587(\u7e41\u9ad4)"},
+    "zh_CN": {"name_en": u"Chinese (Simplified)",
+    "name": u"\u4e2d\u6587(\u7b80\u4f53)"},
+    "zh_TW": {"name_en": u"Chinese (Traditional)",
+    "name": u"\u4e2d\u6587(\u7e41\u9ad4)"},
 }