projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "invalid escape sequences" error on Python 3.6
[youtube-dl]
/
youtube_dl
/
extractor
/
atresplayer.py
diff --git
a/youtube_dl/extractor/atresplayer.py
b/youtube_dl/extractor/atresplayer.py
index 3fb042cea4bfa68f0624cadf9e65e2d9e27c3c4a..e3c669830343bb4f698dc342adebbd764877fd4b 100644
(file)
--- a/
youtube_dl/extractor/atresplayer.py
+++ b/
youtube_dl/extractor/atresplayer.py
@@
-6,16
+6,14
@@
import hashlib
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import (
- compat_str,
- compat_urllib_parse,
-)
+from ..compat import compat_str
from ..utils import (
from ..utils import (
-
int_or_none
,
+
ExtractorError
,
float_or_none,
float_or_none,
+ int_or_none,
sanitized_Request,
sanitized_Request,
+ urlencode_postdata,
xpath_text,
xpath_text,
- ExtractorError,
)
)
@@
-32,7
+30,7
@@
class AtresPlayerIE(InfoExtractor):
'title': 'Especial Solidario de Nochebuena',
'description': 'md5:e2d52ff12214fa937107d21064075bf1',
'duration': 5527.6,
'title': 'Especial Solidario de Nochebuena',
'description': 'md5:e2d52ff12214fa937107d21064075bf1',
'duration': 5527.6,
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
},
'skip': 'This video is only available for registered users'
},
},
'skip': 'This video is only available for registered users'
},
@@
-45,7
+43,7
@@
class AtresPlayerIE(InfoExtractor):
'title': 'David Bustamante',
'description': 'md5:f33f1c0a05be57f6708d4dd83a3b81c6',
'duration': 1439.0,
'title': 'David Bustamante',
'description': 'md5:f33f1c0a05be57f6708d4dd83a3b81c6',
'duration': 1439.0,
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
},
},
{
},
},
{
@@
-86,7
+84,7
@@
class AtresPlayerIE(InfoExtractor):
}
request = sanitized_Request(
}
request = sanitized_Request(
- self._LOGIN_URL,
compat_urllib_parse.urlencode(login_form).encode('utf-8'
))
+ self._LOGIN_URL,
urlencode_postdata(login_form
))
request.add_header('Content-Type', 'application/x-www-form-urlencoded')
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
request.add_header('Content-Type', 'application/x-www-form-urlencoded')
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
@@
-132,11
+130,6
@@
class AtresPlayerIE(InfoExtractor):
})
formats.append(format_info)
})
formats.append(format_info)
- m3u8_url = player.get('urlVideoHls')
- if m3u8_url:
- formats.extend(self._extract_m3u8_formats(
- m3u8_url, episode_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
-
timestamp = int_or_none(self._download_webpage(
self._TIME_API_URL,
video_id, 'Downloading timestamp', fatal=False), 1000, time.time())
timestamp = int_or_none(self._download_webpage(
self._TIME_API_URL,
video_id, 'Downloading timestamp', fatal=False), 1000, time.time())