summaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/compat.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <[email protected]>2016-03-03 19:24:24 +0800
committerYen Chi Hsuan <[email protected]>2016-03-03 19:24:24 +0800
commite9c0cdd3895436170de33324c1762364380c6a5a (patch)
treecab04671b031f85f9c98634a35927e0b1fefbff4 /youtube_dl/compat.py
parent0cae023b244ffdb37338da97a5e506487b20d7d6 (diff)
downloadyoutube-dl-e9c0cdd3895436170de33324c1762364380c6a5a.tar.gz
youtube-dl-e9c0cdd3895436170de33324c1762364380c6a5a.zip
[jython] Introduce compat_os_name
os.name is always 'java' on Jython
Diffstat (limited to 'youtube_dl/compat.py')
-rw-r--r--youtube_dl/compat.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index b497da696..2771fb5fa 100644
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -326,6 +326,9 @@ def compat_ord(c):
return ord(c)
+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
@@ -346,7 +349,7 @@ else:
# The following are os.path.expanduser implementations from cpython 2.7.8 stdlib
# for different platforms with correct environment variables decoding.
- if os.name == 'posix':
+ if compat_os_name == 'posix':
def compat_expanduser(path):
"""Expand ~ and ~user constructions. If user or $HOME is unknown,
do nothing."""
@@ -370,7 +373,7 @@ else:
userhome = pwent.pw_dir
userhome = userhome.rstrip('/')
return (userhome + path[i:]) or '/'
- elif os.name == 'nt' or os.name == 'ce':
+ elif compat_os_name == 'nt' or compat_os_name == 'ce':
def compat_expanduser(path):
"""Expand ~ and ~user constructs.
@@ -556,6 +559,7 @@ __all__ = [
'compat_itertools_count',
'compat_kwargs',
'compat_ord',
+ 'compat_os_name',
'compat_parse_qs',
'compat_print',
'compat_shlex_split',