From e0a4d4477cfc93b2dc06dd212778cb4eef92fc59 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Fri, 27 May 2016 20:45:37 -0300 Subject: [PATCH] [1.10.x] Fixed #26673 -- Fixed a I18N test case error on Windows+Python 2.7. `subprocess.Popen` doesn't accept enviroment vars with Unicode var name or value. Backport of 15a5755e7cca630c2a0dbbcba436621ccc437c21 from master --- tests/i18n/test_compilation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py index fdc5fce9b8e..50c868ec7a0 100644 --- a/tests/i18n/test_compilation.py +++ b/tests/i18n/test_compilation.py @@ -171,7 +171,7 @@ class CompilationErrorHandling(MessageCompilationTests): self.addCleanup(self.rmfile, os.path.join(self.test_dir, mo_file)) # Make sure the output of msgfmt is unaffected by the current locale. env = os.environ.copy() - env.update({'LANG': 'C'}) + env.update({str('LANG'): str('C')}) with mock.patch('django.core.management.utils.Popen', lambda *args, **kwargs: Popen(*args, env=env, **kwargs)): if six.PY2: # Various assertRaises on PY2 don't support unicode error messages.