From: Sergey M. <dstftw@gmail.com>
Date: Fri, 10 Oct 2014 15:28:18 +0000 (+0700)
Subject: Merge pull request #3911 from Dockheas23/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c8e390c2b050e5fbe0a145ad4b621b2496020bab;hp=823f1e015a8880442f9b9fcf2943f647f5cf8039;p=youtube-dl

Merge pull request #3911 from Dockheas23/master

KeyError on initialising YoutubeDL in python3 #3910
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 4a9610355..dec0e20e7 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -228,11 +228,11 @@ class YoutubeDL(object):
 
         if (sys.version_info >= (3,) and sys.platform != 'win32' and
                 sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968']
-                and not params['restrictfilenames']):
+                and not params.get('restrictfilenames', False)):
             # On Python 3, the Unicode filesystem API will throw errors (#1474)
             self.report_warning(
                 'Assuming --restrict-filenames since file system encoding '
-                'cannot encode all charactes. '
+                'cannot encode all characters. '
                 'Set the LC_ALL environment variable to fix this.')
             self.params['restrictfilenames'] = True