From: Philipp Hagemeister Date: Sat, 15 Dec 2012 22:54:44 +0000 (+0100) Subject: Do not decode None X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=0be41ec241d8308378c134d803f6b67b93a6c8de;p=youtube-dl Do not decode None --- diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index ce4e67848..e86ac49b3 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -506,7 +506,8 @@ def _real_main(): if sys.version_info < (3,): # In Python 2, sys.argv is a bytestring (also note http://bugs.python.org/issue2128 for Windows systems) - opts.outtmpl = opts.outtmpl.decode(preferredencoding()) + 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 u'%(title)s-%(id)s-%(format)s.%(ext)s') or (opts.format == '-1' and u'%(id)s-%(format)s.%(ext)s')