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/__init__.py
View File

@ -98,6 +98,7 @@ from .options import (
parseOpts,
)
from .utils import (
compat_expanduser,
compat_getpass,
compat_print,
DateRange,
@ -287,7 +288,7 @@ def _real_main(argv=None):
u' template'.format(outtmpl))
any_printing = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
download_archive_fn = os.path.expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
download_archive_fn = compat_expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
ydl_opts = {
'usenetrc': opts.usenetrc,