projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[keek] extract uploader and uploader id with _search_regex
[youtube-dl]
/
youtube_dl
/
options.py
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index 9016e34983d3fed5e0fab72e9a8626124cdee859..5eccc0a705a6e7acda232541189b713712db97a8 100644
(file)
--- a/
youtube_dl/options.py
+++ b/
youtube_dl/options.py
@@
-2,7
+2,6
@@
from __future__ import unicode_literals
import os.path
import optparse
import os.path
import optparse
-import shlex
import sys
from .downloader.external import list_external_downloaders
import sys
from .downloader.external import list_external_downloaders
@@
-11,6
+10,7
@@
from .compat import (
compat_get_terminal_size,
compat_getenv,
compat_kwargs,
compat_get_terminal_size,
compat_getenv,
compat_kwargs,
+ compat_shlex_split,
)
from .utils import (
preferredencoding,
)
from .utils import (
preferredencoding,
@@
-28,7
+28,7
@@
def parseOpts(overrideArguments=None):
try:
res = []
for l in optionf:
try:
res = []
for l in optionf:
- res +=
shlex.
split(l, comments=True)
+ res +=
compat_shlex_
split(l, comments=True)
finally:
optionf.close()
return res
finally:
optionf.close()
return res
@@
-320,7
+320,7
@@
def parseOpts(overrideArguments=None):
authentication.add_option(
'--video-password',
dest='videopassword', metavar='PASSWORD',
authentication.add_option(
'--video-password',
dest='videopassword', metavar='PASSWORD',
- help='Video password (vimeo, smotri)')
+ help='Video password (vimeo, smotri
, youku
)')
video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option(
video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option(