projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3f612f0
)
Add missing r prefix for _VALID_URLs
author
stepshal
<nessento@openmailbox.org>
Thu, 8 Sep 2016 10:04:57 +0000
(17:04 +0700)
committer
stepshal
<nessento@openmailbox.org>
Thu, 8 Sep 2016 10:04:57 +0000
(17:04 +0700)
youtube_dl/extractor/abcnews.py
patch
|
blob
|
history
youtube_dl/extractor/ard.py
patch
|
blob
|
history
youtube_dl/extractor/globo.py
patch
|
blob
|
history
youtube_dl/extractor/onet.py
patch
|
blob
|
history
youtube_dl/extractor/rutube.py
patch
|
blob
|
history
youtube_dl/extractor/spiegel.py
patch
|
blob
|
history
youtube_dl/extractor/twitter.py
patch
|
blob
|
history
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/abcnews.py
b/youtube_dl/extractor/abcnews.py
index 01247feadc37bde52840329b682987f072c5ecba..6ae5d9a96ac6919ab1ea1ae906bf510018d5578b 100644
(file)
--- a/
youtube_dl/extractor/abcnews.py
+++ b/
youtube_dl/extractor/abcnews.py
@@
-49,7
+49,7
@@
class AbcNewsVideoIE(AMPIE):
class AbcNewsIE(InfoExtractor):
IE_NAME = 'abcnews'
class AbcNewsIE(InfoExtractor):
IE_NAME = 'abcnews'
- _VALID_URL = 'https?://abcnews\.go\.com/(?:[^/]+/)+(?P<display_id>[0-9a-z-]+)/story\?id=(?P<id>\d+)'
+ _VALID_URL =
r
'https?://abcnews\.go\.com/(?:[^/]+/)+(?P<display_id>[0-9a-z-]+)/story\?id=(?P<id>\d+)'
_TESTS = [{
'url': 'http://abcnews.go.com/Blotter/News/dramatic-video-rare-death-job-america/story?id=10498713#.UIhwosWHLjY',
_TESTS = [{
'url': 'http://abcnews.go.com/Blotter/News/dramatic-video-rare-death-job-america/story?id=10498713#.UIhwosWHLjY',
diff --git
a/youtube_dl/extractor/ard.py
b/youtube_dl/extractor/ard.py
index 07e67dd3393962eedccd2460954711d01f08efdb..3a806a69b837a02d430d9e8f131acc116dbbe004 100644
(file)
--- a/
youtube_dl/extractor/ard.py
+++ b/
youtube_dl/extractor/ard.py
@@
-238,7
+238,7
@@
class ARDMediathekIE(InfoExtractor):
class ARDIE(InfoExtractor):
class ARDIE(InfoExtractor):
- _VALID_URL = '(?P<mainurl>https?://(www\.)?daserste\.de/[^?#]+/videos/(?P<display_id>[^/?#]+)-(?P<id>[0-9]+))\.html'
+ _VALID_URL =
r
'(?P<mainurl>https?://(www\.)?daserste\.de/[^?#]+/videos/(?P<display_id>[^/?#]+)-(?P<id>[0-9]+))\.html'
_TEST = {
'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
'md5': 'd216c3a86493f9322545e045ddc3eb35',
_TEST = {
'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
'md5': 'd216c3a86493f9322545e045ddc3eb35',
diff --git
a/youtube_dl/extractor/globo.py
b/youtube_dl/extractor/globo.py
index dbacbfc61ffbdea6f595f2182acf78261e3c8053..5638be48fbc41f179f53be64f6698be8404baf47 100644
(file)
--- a/
youtube_dl/extractor/globo.py
+++ b/
youtube_dl/extractor/globo.py
@@
-19,7
+19,7
@@
from ..utils import (
class GloboIE(InfoExtractor):
class GloboIE(InfoExtractor):
- _VALID_URL = '(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
+ _VALID_URL =
r
'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
_API_URL_TEMPLATE = 'http://api.globovideos.com/videos/%s/playlist'
_SECURITY_URL_TEMPLATE = 'http://security.video.globo.com/videos/%s/hash?player=flash&version=17.0.0.132&resource_id=%s'
_API_URL_TEMPLATE = 'http://api.globovideos.com/videos/%s/playlist'
_SECURITY_URL_TEMPLATE = 'http://security.video.globo.com/videos/%s/hash?player=flash&version=17.0.0.132&resource_id=%s'
@@
-396,7
+396,7
@@
class GloboIE(InfoExtractor):
class GloboArticleIE(InfoExtractor):
class GloboArticleIE(InfoExtractor):
- _VALID_URL = 'https?://.+?\.globo\.com/(?:[^/]+/)*(?P<id>[^/]+)(?:\.html)?'
+ _VALID_URL =
r
'https?://.+?\.globo\.com/(?:[^/]+/)*(?P<id>[^/]+)(?:\.html)?'
_VIDEOID_REGEXES = [
r'\bdata-video-id=["\'](\d{7,})',
_VIDEOID_REGEXES = [
r'\bdata-video-id=["\'](\d{7,})',
diff --git
a/youtube_dl/extractor/onet.py
b/youtube_dl/extractor/onet.py
index fc22ad5eb61b616afa4aaf6895302118fa4f2a50..9cbc7c2e2f8888f32722f95d816dea4fdb9325db 100644
(file)
--- a/
youtube_dl/extractor/onet.py
+++ b/
youtube_dl/extractor/onet.py
@@
-90,7
+90,7
@@
class OnetBaseIE(InfoExtractor):
class OnetIE(OnetBaseIE):
class OnetIE(OnetBaseIE):
- _VALID_URL = 'https?://(?:www\.)?onet\.tv/[a-z]/[a-z]+/(?P<display_id>[0-9a-z-]+)/(?P<id>[0-9a-z]+)'
+ _VALID_URL =
r
'https?://(?:www\.)?onet\.tv/[a-z]/[a-z]+/(?P<display_id>[0-9a-z-]+)/(?P<id>[0-9a-z]+)'
IE_NAME = 'onet.tv'
_TEST = {
IE_NAME = 'onet.tv'
_TEST = {
diff --git
a/youtube_dl/extractor/rutube.py
b/youtube_dl/extractor/rutube.py
index 9ca4ae147cb1e3c430de3abd9fd0927aaee2ed5a..5d0ace5bfb472acc056d599368b02bb2573eafb8 100644
(file)
--- a/
youtube_dl/extractor/rutube.py
+++ b/
youtube_dl/extractor/rutube.py
@@
-88,7
+88,7
@@
class RutubeIE(InfoExtractor):
class RutubeEmbedIE(InfoExtractor):
IE_NAME = 'rutube:embed'
IE_DESC = 'Rutube embedded videos'
class RutubeEmbedIE(InfoExtractor):
IE_NAME = 'rutube:embed'
IE_DESC = 'Rutube embedded videos'
- _VALID_URL = 'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)'
+ _VALID_URL =
r
'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
_TESTS = [{
'url': 'http://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
diff --git
a/youtube_dl/extractor/spiegel.py
b/youtube_dl/extractor/spiegel.py
index 3c552807e268bb50a6a7d178e61d0834b0c48a42..74cb3a08ae35cb2c314d6f7f016dd6de54576578 100644
(file)
--- a/
youtube_dl/extractor/spiegel.py
+++ b/
youtube_dl/extractor/spiegel.py
@@
-103,7
+103,7
@@
class SpiegelIE(InfoExtractor):
class SpiegelArticleIE(InfoExtractor):
class SpiegelArticleIE(InfoExtractor):
- _VALID_URL = 'https?://www\.spiegel\.de/(?!video/)[^?#]*?-(?P<id>[0-9]+)\.html'
+ _VALID_URL =
r
'https?://www\.spiegel\.de/(?!video/)[^?#]*?-(?P<id>[0-9]+)\.html'
IE_NAME = 'Spiegel:Article'
IE_DESC = 'Articles on spiegel.de'
_TESTS = [{
IE_NAME = 'Spiegel:Article'
IE_DESC = 'Articles on spiegel.de'
_TESTS = [{
diff --git
a/youtube_dl/extractor/twitter.py
b/youtube_dl/extractor/twitter.py
index b7384298619608ab879337326b1e6719962932e3..c5a5843b6107b993b9a36f902e32c2cb97611dd1 100644
(file)
--- a/
youtube_dl/extractor/twitter.py
+++ b/
youtube_dl/extractor/twitter.py
@@
-342,7
+342,7
@@
class TwitterIE(InfoExtractor):
class TwitterAmplifyIE(TwitterBaseIE):
IE_NAME = 'twitter:amplify'
class TwitterAmplifyIE(TwitterBaseIE):
IE_NAME = 'twitter:amplify'
- _VALID_URL = 'https?://amp\.twimg\.com/v/(?P<id>[0-9a-f\-]{36})'
+ _VALID_URL =
r
'https?://amp\.twimg\.com/v/(?P<id>[0-9a-f\-]{36})'
_TEST = {
'url': 'https://amp.twimg.com/v/0ba0c3c7-0af3-4c0a-bed5-7efd1ffa2951',
_TEST = {
'url': 'https://amp.twimg.com/v/0ba0c3c7-0af3-4c0a-bed5-7efd1ffa2951',
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index 8fc26bd02cc4d3598eda3015fbc4a3f01d915896..5082cb589c430ed35fda45b97a9c7322aa66d594 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-2417,7
+2417,7
@@
class YoutubeSubscriptionsIE(YoutubeFeedsInfoExtractor):
class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
IE_DESC = 'Youtube watch history, ":ythistory" for short (requires authentication)'
class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
IE_DESC = 'Youtube watch history, ":ythistory" for short (requires authentication)'
- _VALID_URL = 'https?://www\.youtube\.com/feed/history|:ythistory'
+ _VALID_URL =
r
'https?://www\.youtube\.com/feed/history|:ythistory'
_FEED_NAME = 'history'
_PLAYLIST_TITLE = 'Youtube History'
_FEED_NAME = 'history'
_PLAYLIST_TITLE = 'Youtube History'