projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve some _VALID_URLs
[youtube-dl]
/
youtube_dl
/
extractor
/
ustream.py
diff --git
a/youtube_dl/extractor/ustream.py
b/youtube_dl/extractor/ustream.py
index 54605d863027968a4a15c5358b9f98539c69c4b3..a3dc9d33ec6464b524b8ac974e04e63c06c02458 100644
(file)
--- a/
youtube_dl/extractor/ustream.py
+++ b/
youtube_dl/extractor/ustream.py
@@
-14,7
+14,7
@@
from ..utils import (
class UstreamIE(InfoExtractor):
class UstreamIE(InfoExtractor):
- _VALID_URL = r'https?://
www\.
ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<id>\d+)'
+ _VALID_URL = r'https?://
(?:www\.)?
ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<id>\d+)'
IE_NAME = 'ustream'
_TESTS = [{
'url': 'http://www.ustream.tv/recorded/20274954',
IE_NAME = 'ustream'
_TESTS = [{
'url': 'http://www.ustream.tv/recorded/20274954',
@@
-117,7
+117,7
@@
class UstreamIE(InfoExtractor):
class UstreamChannelIE(InfoExtractor):
class UstreamChannelIE(InfoExtractor):
- _VALID_URL = r'https?://
www\.
ustream\.tv/channel/(?P<slug>.+)'
+ _VALID_URL = r'https?://
(?:www\.)?
ustream\.tv/channel/(?P<slug>.+)'
IE_NAME = 'ustream:channel'
_TEST = {
'url': 'http://www.ustream.tv/channel/channeljapan',
IE_NAME = 'ustream:channel'
_TEST = {
'url': 'http://www.ustream.tv/channel/channeljapan',