mollusk/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'compat-getenv-and-expanduser' of https://github.com/dstftw/youtube-dl into dstftw-compat-getenv-and-expanduser

Browse Source 
Conflicts:
	test/test_utils.py
	youtube_dl/__init__.py
This commit is contained in:
Sergey M․
2014-10-26 19:56:52 +07:00
parent 1bdeb7be2e fc66e4a0d5
commit f889cea109
6 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/YoutubeDL.py
View File

@ -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: