aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-10-26 19:58:39 +0700
committerSergey M․ <dstftw@gmail.com>2014-10-26 19:58:39 +0700
commit639a422d21b9ad23a64f5bc27230896837b518ce (patch)
tree08cf0b33420f081219bba906db60c673086cde35 /youtube_dl/YoutubeDL.py
parent1bdeb7be2e5bef703d54d8786fbc6f3c0c23faef (diff)
parentf889cea109b4e2647e3fd6a462c9893b88b21e04 (diff)
downloadyoutube-dl-639a422d21b9ad23a64f5bc27230896837b518ce.tar.xz
Merge branch 'dstftw-compat-getenv-and-expanduser'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 75461f19d..242affb5b 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -24,6 +24,7 @@ if os.name == 'nt':
from .utils import (
compat_cookiejar,
+ compat_expanduser,
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)
- tmpl = os.path.expanduser(outtmpl)
+ tmpl = compat_expanduser(outtmpl)
filename = tmpl % template_dict
return filename
except ValueError as err: