projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8092 from bpfoley/twitter-thumbnail
[youtube-dl]
/
youtube_dl
/
compat.py
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index 7b9afc36df2a2df9336f24054334782577f3bd52..74702786a76ee612a7f9ec91567752e22e70eda6 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-331,6
+331,9
@@
def compat_ord(c):
return 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
if sys.version_info >= (3, 0):
compat_getenv = os.getenv
compat_expanduser = os.path.expanduser
@@
-351,7
+354,7
@@
else:
# The following are os.path.expanduser implementations from cpython 2.7.8 stdlib
# for different platforms with correct environment variables decoding.
# 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."""
def compat_expanduser(path):
"""Expand ~ and ~user constructions. If user or $HOME is unknown,
do nothing."""
@@
-375,7
+378,7
@@
else:
userhome = pwent.pw_dir
userhome = userhome.rstrip('/')
return (userhome + path[i:]) or '/'
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.
def compat_expanduser(path):
"""Expand ~ and ~user constructs.
@@
-562,6
+565,7
@@
__all__ = [
'compat_itertools_count',
'compat_kwargs',
'compat_ord',
'compat_itertools_count',
'compat_kwargs',
'compat_ord',
+ 'compat_os_name',
'compat_parse_qs',
'compat_print',
'compat_shlex_split',
'compat_parse_qs',
'compat_print',
'compat_shlex_split',