Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 19:47:14 +08:00
Code Issues Releases Wiki Activity

Merge pull request #269 from ytdl-org/master

Browse Source 
[pull] master from ytdl-org:master
This commit is contained in:
pull[bot] 2020-02-29 11:04:57 +00:00 committed by GitHub
commit d49d87225f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/common.py
View File

@ -2341,7 +2341,7 @@ class InfoExtractor(object):
return []
ism_doc, urlh = res
return self._parse_ism_formats(ism_doc, urlh.geturl(), ism_id)
return self._parse_ism_formats(ism_doc, compat_str(urlh.geturl()), ism_id)
def _parse_ism_formats(self, ism_doc, ism_url, ism_id=None):
"""

2
youtube_dl/options.py
View File

@ -134,7 +134,7 @@ def parseOpts(overrideArguments=None):
action='help',
help='Print this help text and exit')
general.add_option(
'-v', '--version',
'--version',
action='version',
help='Print program version and exit')
general.add_option(