aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/options.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:21:46 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-11-23 22:21:46 +0100
commitb74e86f48aa6d007b681e2723ff28fe82a49fa9d (patch)
tree660c068ab4ea4835c8311c974b029360d5350875 /youtube_dl/options.py
parent3d36cea4aca303f6bde5b5453f4e3aeec8ee41e1 (diff)
Fix all PEP8 issues except E501
Diffstat (limited to 'youtube_dl/options.py')
-rw-r--r--youtube_dl/options.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 38177c1d7..da02fb6bb 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -262,7 +262,8 @@ def parseOpts(overrideArguments=None):
video_format.add_option(
'-f', '--format',
action='store', dest='format', metavar='FORMAT', default=None,
- help='video format code, specify the order of preference using'
+ help=(
+ 'video format code, specify the order of preference using'
' slashes: -f 22/17/18 . -f mp4 , -f m4a and -f flv are also'
' supported. You can also use the special names "best",'
' "bestvideo", "bestaudio", "worst", "worstvideo" and'
@@ -271,7 +272,7 @@ def parseOpts(overrideArguments=None):
' -f 136/137/mp4/bestvideo,140/m4a/bestaudio.'
' You can merge the video and audio of two formats into a single'
' file using -f <video-format>+<audio-format> (requires ffmpeg or'
- ' avconv), for example -f bestvideo+bestaudio.')
+ ' avconv), for example -f bestvideo+bestaudio.'))
video_format.add_option(
'--all-formats',
action='store_const', dest='format', const='all',