aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-11-20 06:18:24 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-11-20 06:18:24 +0100
commit8694c60000d2aed2b37e10da0ffda132249ff10a (patch)
tree57ef085461aad2023942f9d59f438895fd2396e2
parent9d1538182fdc540fa79ec8341385a980cde334e7 (diff)
import json for --dump-json
-rw-r--r--youtube_dl/YoutubeDL.py3
-rw-r--r--youtube_dl/__init__.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index d8d55d7d7..bd093add8 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -5,6 +5,7 @@ from __future__ import absolute_import
import errno
import io
+import json
import os
import re
import shutil
@@ -84,7 +85,7 @@ class YoutubeDL(object):
forcethumbnail: Force printing thumbnail URL.
forcedescription: Force printing description.
forcefilename: Force printing final filename.
- forcejson: Force printing json information.
+ forcejson: Force printing info_dict as JSON.
simulate: Do not download the video files.
format: Video format code.
format_limit: Highest quality format to try.
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 7ab99bdd1..e27bd4544 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -308,7 +308,7 @@ def parseOpts(overrideArguments=None):
help='simulate, quiet but print output format', default=False)
verbosity.add_option('-j', '--dump-json',
action='store_true', dest='dumpjson',
- help='simulate, quiet but print json information', default=False)
+ help='simulate, quiet but print JSON information', default=False)
verbosity.add_option('--newline',
action='store_true', dest='progress_with_newline', help='output progress bar as new lines', default=False)
verbosity.add_option('--no-progress',