summaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorFilippo Valsorda <[email protected]>2012-12-11 12:15:16 +0100
committerFilippo Valsorda <[email protected]>2012-12-11 12:15:16 +0100
commit95eb771dcda47f948b050da85c7ff22539e3ee12 (patch)
tree3bea4b6975544ef76241ccf402de541da350b4ac /youtube_dl/__init__.py
parent3c6ffbaedbbae8734f6b86fea1169413b656abf3 (diff)
parent4fb1acc212555e3e817f858dce964876eef75d85 (diff)
downloadyoutube-dl-95eb771dcda47f948b050da85c7ff22539e3ee12.tar.gz
youtube-dl-95eb771dcda47f948b050da85c7ff22539e3ee12.zip
Merge branch 'master' into fork_master
Conflicts: .travis.yml
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 8e46dfea9..d7e1a91ad 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -229,6 +229,7 @@ def parseOpts():
general.add_option('--list-extractors',
action='store_true', dest='list_extractors',
help='List all supported extractors and the URLs they would handle', default=False)
+ general.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP)
selection.add_option('--playlist-start',
dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is %default)', default=1)
@@ -551,6 +552,7 @@ def _real_main():
'max_downloads': opts.max_downloads,
'prefer_free_formats': opts.prefer_free_formats,
'verbose': opts.verbose,
+ 'test': opts.test,
})
if opts.verbose: