projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'compat-getenv-and-expanduser' of https://github.com/dstftw/youtube...
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 75461f19d06d87e393d8428388119e83b11a98e2..242affb5b8dbbc88ebf6806642a0e4e61931d0c3 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-24,6
+24,7
@@
if os.name == 'nt':
from .utils import (
compat_cookiejar,
from .utils import (
compat_cookiejar,
+ compat_expanduser,
compat_http_client,
compat_str,
compat_urllib_error,
compat_http_client,
compat_str,
compat_urllib_error,
@@
-451,7
+452,7
@@
class YoutubeDL(object):
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
- tmpl =
os.path.
expanduser(outtmpl)
+ tmpl =
compat_
expanduser(outtmpl)
filename = tmpl % template_dict
return filename
except ValueError as err:
filename = tmpl % template_dict
return filename
except ValueError as err: