youtube-dl

commit 0be41ec241d8308378c134d803f6b67b93a6c8de
parent f1171f7c2df9551ba8c7b3b7042bfa15d2d1ea6b
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sat, 15 Dec 2012 23:54:44 +0100

Do not decode None

Diffstat:
M
youtube_dl/__init__.py
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git 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')