Merge pull request #3964 from shin-/3963-unicode-env

Don't break when interpolating environment with unicode characters
This commit is contained in:
Joffrey F 2016-10-11 12:00:36 -07:00 • committed by GitHub
commit e4bb9bde30
3 changed files with 28 additions and 0 deletions

View file

@ -1111,6 +1111,8 @@ def format_environment(environment):
def format_env(key, value):
if value is None:
return key
if isinstance(value, six.binary_type):
value = value.decode('utf-8')
return '{key}={value}'.format(key=key, value=value)
return [format_env(*item) for item in environment.items()]