From dce62a67173781daa148eb1340e31ea2ceff76b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Mon, 22 Aug 2011 19:21:55 +0200 Subject: [PATCH] Ensure environment variable are str issue87001 --- tryton/translate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tryton/translate.py b/tryton/translate.py index 1c10b33df6..5ff8104fe5 100644 --- a/tryton/translate.py +++ b/tryton/translate.py @@ -172,11 +172,13 @@ def setlang(lang=None, locale_dict=None): elif os.name == 'mac' or \ (hasattr(os, 'uname') and os.uname()[0] == 'Darwin'): encoding = 'UTF-8' + # ensure environment variable are str + lang, lang2, encoding = str(lang), str(lang2), str(encoding) os.environ['LANGUAGE'] = lang os.environ['LC_ALL'] = lang2 + '.' + encoding os.environ['LC_MESSAGES'] = lang2 + '.' + encoding os.environ['LANG'] = lang + '.' + encoding - locale.setlocale(locale.LC_ALL, str(lang2 + '.' + encoding)) + locale.setlocale(locale.LC_ALL, lang2 + '.' + encoding) except locale.Error: logging.getLogger('translate').info( _('Unable to set locale %s') % lang2 + '.' + encoding)