diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-04-04 00:30:37 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-04-04 00:30:37 +0600 |
| commit | ff556f5c09ec8700bb012a58a5e39505b887b774 (patch) | |
| tree | 110258f20226ef048a06c5437bd46e707fd38661 /youtube_dl/__init__.py | |
| parent | 16fa01291bd94703e2258a68bef1491d57f0dabc (diff) | |
| download | youtube-dl-ff556f5c09ec8700bb012a58a5e39505b887b774.zip youtube-dl-ff556f5c09ec8700bb012a58a5e39505b887b774.tar.gz youtube-dl-ff556f5c09ec8700bb012a58a5e39505b887b774.tar.bz2 | |
Do not encode outtmpl twice (Closes #5288)
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 852b2fc..1c8b411 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -189,10 +189,6 @@ def _real_main(argv=None): if opts.allsubtitles and not opts.writeautomaticsub: opts.writesubtitles = True - if sys.version_info < (3,): - # In Python 2, sys.argv is a bytestring (also note http://bugs.python.org/issue2128 for Windows systems) - if opts.outtmpl is not None: - opts.outtmpl = opts.outtmpl.decode(preferredencoding()) outtmpl = ((opts.outtmpl is not None and opts.outtmpl) or (opts.format == '-1' and opts.usetitle and '%(title)s-%(id)s-%(format)s.%(ext)s') or (opts.format == '-1' and '%(id)s-%(format)s.%(ext)s') or |