projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #6428 from dstftw/improve-generic-smil-support
[youtube-dl]
/
youtube_dl
/
extractor
/
nowtv.py
diff --git
a/youtube_dl/extractor/nowtv.py
b/youtube_dl/extractor/nowtv.py
index 11ce371688094d121a9596cde6678ba99eb479e1..66c627becc845650cfb0fc5d712a07e79fdbb8ce 100644
(file)
--- a/
youtube_dl/extractor/nowtv.py
+++ b/
youtube_dl/extractor/nowtv.py
@@
-1,8
+1,6
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from ..compat import compat_str
from ..utils import (
from .common import InfoExtractor
from ..compat import compat_str
from ..utils import (
@@
-16,7
+14,7
@@
from ..utils import (
class NowTVIE(InfoExtractor):
class NowTVIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?nowtv\.
de
/(?:rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<id>.+?)/(?:player|preview)'
+ _VALID_URL = r'https?://(?:www\.)?nowtv\.
(?:de|at|ch)
/(?:rtl|rtl2|rtlnitro|superrtl|ntv|vox)/(?P<id>.+?)/(?:player|preview)'
_TESTS = [{
# rtl
_TESTS = [{
# rtl
@@
-129,6
+127,9
@@
class NowTVIE(InfoExtractor):
}, {
'url': 'http://www.nowtv.de/rtl/bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit/preview',
'only_matching': True,
}, {
'url': 'http://www.nowtv.de/rtl/bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit/preview',
'only_matching': True,
+ }, {
+ 'url': 'http://www.nowtv.at/rtl/bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit/preview?return=/rtl/bauer-sucht-frau/die-neuen-bauern-und-eine-hochzeit',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):