aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-01 10:43:58 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-01 10:43:58 +0100
commit33ec2ae8d9450a59273d2156bd2ef77d2bd93a66 (patch)
treeca5ff4e17ad0cad43495372afae1d40aa94be526 /youtube_dl/YoutubeDL.py
parenta0ddb8a2faaacdcf7b3a089ca9baeee5f310d03c (diff)
parentc801b2051a91ccddff5b3c5df23944229cd13266 (diff)
downloadyoutube-dl-33ec2ae8d9450a59273d2156bd2ef77d2bd93a66.tar.xz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rw-r--r--youtube_dl/YoutubeDL.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 8ebbfe78f..3c47eb9dc 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -165,6 +165,8 @@ class YoutubeDL(object):
def __init__(self, params=None):
"""Create a FileDownloader object with the given options."""
+ if params is None:
+ params = {}
self._ies = []
self._ies_instances = {}
self._pps = []
@@ -173,7 +175,7 @@ class YoutubeDL(object):
self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
self._err_file = sys.stderr
- self.params = {} if params is None else params
+ self.params = params
if params.get('bidi_workaround', False):
try: