projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a wrapper around xml.etree.ElementTree.fromstring in python 2.x (#7178)
[youtube-dl]
/
youtube_dl
/
extractor
/
douyutv.py
diff --git
a/youtube_dl/extractor/douyutv.py
b/youtube_dl/extractor/douyutv.py
index 3a1665ab4ba24eff9e95d8a424379e32c54f1a97..373b3b4b4735d8544128c48a10037eed3c570e5d 100644
(file)
--- a/
youtube_dl/extractor/douyutv.py
+++ b/
youtube_dl/extractor/douyutv.py
@@
-9,6
+9,7
@@
from ..compat import (compat_str, compat_basestring)
class DouyuTVIE(InfoExtractor):
class DouyuTVIE(InfoExtractor):
+ IE_DESC = '斗鱼'
_VALID_URL = r'http://(?:www\.)?douyutv\.com/(?P<id>[A-Za-z0-9]+)'
_TESTS = [{
'url': 'http://www.douyutv.com/iseven',
_VALID_URL = r'http://(?:www\.)?douyutv\.com/(?P<id>[A-Za-z0-9]+)'
_TESTS = [{
'url': 'http://www.douyutv.com/iseven',
@@
-67,7
+68,7
@@
class DouyuTVIE(InfoExtractor):
error_code = config.get('error', 0)
if error_code is not 0:
error_desc = 'Server reported error %i' % error_code
error_code = config.get('error', 0)
if error_code is not 0:
error_desc = 'Server reported error %i' % error_code
- if isinstance(data,
compat_str) or isinstance(data, compat_basestring
):
+ if isinstance(data,
(compat_str, compat_basestring)
):
error_desc += ': ' + data
raise ExtractorError(error_desc, expected=True)
error_desc += ': ' + data
raise ExtractorError(error_desc, expected=True)