Skip to content

Commit

Permalink
[compat] Add compat_setenv
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey M․ committed May 9, 2016
1 parent 6104cc2 commit fe40f9e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/test_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from youtube_dl.utils import get_filesystem_encoding
from youtube_dl.compat import (
compat_getenv,
compat_setenv,
compat_etree_fromstring,
compat_expanduser,
compat_shlex_split,
Expand All @@ -31,6 +32,13 @@ def test_compat_getenv(self):
else test_str.encode(get_filesystem_encoding()))
self.assertEqual(compat_getenv('YOUTUBE-DL-TEST'), test_str)

def test_compat_setenv(self):
test_var = 'YOUTUBE-DL-TEST'
test_str = 'тест'
compat_setenv(test_var, test_str)
compat_getenv(test_var)
self.assertEqual(compat_getenv(test_var), test_str)

def test_compat_expanduser(self):
old_home = os.environ.get('HOME')
test_str = 'C:\Documents and Settings\тест\Application Data'
Expand Down
10 changes: 10 additions & 0 deletions youtube_dl/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ def compat_ord(c):
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)
Expand All @@ -384,6 +387,12 @@ def compat_getenv(key, default=None):
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.
Expand Down Expand Up @@ -604,6 +613,7 @@ def compat_itertools_count(start=0, step=1):
'compat_os_name',
'compat_parse_qs',
'compat_print',
'compat_setenv',
'compat_shlex_split',
'compat_socket_create_connection',
'compat_str',
Expand Down

0 comments on commit fe40f9e

Please sign in to comment.