diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-03-26 02:31:16 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-03-26 02:31:16 +0700 |
| commit | 590bc6f6a1cb513852a22f6db0ee36e9bd138f64 (patch) | |
| tree | d87b1bb1312df54789c96868dd61ac10ba8205a7 /youtube_dl/YoutubeDL.py | |
| parent | 51098426b83a8ebce4b0c08e869ce023232089fd (diff) | |
| download | youtube-dl-590bc6f6a1cb513852a22f6db0ee36e9bd138f64.tar.xz | |
Use expand_path where appropriate (closes #12556)
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index cb502c26f..21586f0f4 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -29,7 +29,6 @@ import random from .compat import ( compat_basestring, compat_cookiejar, - compat_expanduser, compat_get_terminal_size, compat_http_client, compat_kwargs, @@ -54,6 +53,7 @@ from .utils import ( encode_compat_str, encodeFilename, error_to_compat_str, + expand_path, ExtractorError, format_bytes, formatSeconds, @@ -672,7 +672,7 @@ class YoutubeDL(object): FORMAT_RE.format(numeric_field), r'%({0})s'.format(numeric_field), outtmpl) - tmpl = compat_expanduser(outtmpl) + tmpl = expand_path(outtmpl) filename = tmpl % template_dict # Temporary fix for #4787 # 'Treat' all problem characters by passing filename through preferredencoding @@ -2170,7 +2170,7 @@ class YoutubeDL(object): if opts_cookiefile is None: self.cookiejar = compat_cookiejar.CookieJar() else: - opts_cookiefile = compat_expanduser(opts_cookiefile) + opts_cookiefile = expand_path(opts_cookiefile) self.cookiejar = compat_cookiejar.MozillaCookieJar( opts_cookiefile) if os.access(opts_cookiefile, os.R_OK): |