[compat] Add compat_setenv

This commit is contained in:
Sergey M․ 2016-05-09 21:55:03 +06:00
parent 6104cc2985
commit fe40f9eef2
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
2 changed files with 18 additions and 0 deletions

View file

@ -373,6 +373,9 @@ compat_os_name = os._name if os.name == 'java' else os.name
if sys.version_info >= (3, 0):
compat_getenv = os.getenv
compat_expanduser = os.path.expanduser
def compat_setenv(key, value, env=os.environ):
env[key] = value
else:
# Environment variables should be decoded with filesystem encoding.
# Otherwise it will fail if any non-ASCII characters present (see #3854 #3217 #2918)
@ -384,6 +387,12 @@ else:
env = env.decode(get_filesystem_encoding())
return env
def compat_setenv(key, value, env=os.environ):
def encode(v):
from .utils import get_filesystem_encoding
return v.encode(get_filesystem_encoding()) if isinstance(v, compat_str) else v
env[encode(key)] = encode(value)
# HACK: The default implementations of os.path.expanduser from cpython do not decode
# environment variables with filesystem encoding. We will work around this by
# providing adjusted implementations.
@ -604,6 +613,7 @@ __all__ = [
'compat_os_name',
'compat_parse_qs',
'compat_print',
'compat_setenv',
'compat_shlex_split',
'compat_socket_create_connection',
'compat_str',