projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'Tithen-Firion/master'
[youtube-dl]
/
youtube_dl
/
extractor
/
youporn.py
diff --git
a/youtube_dl/extractor/youporn.py
b/youtube_dl/extractor/youporn.py
index ee61e2381c204c7bf73fd1ee434387e98375201b..107c9ac36e4f4f48bd768567e4399af15fd07743 100644
(file)
--- a/
youtube_dl/extractor/youporn.py
+++ b/
youtube_dl/extractor/youporn.py
@@
-6,10
+6,11
@@
import re
import sys
from .common import InfoExtractor
import sys
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse_urlparse,
compat_urllib_request,
-
+)
+from ..utils import (
ExtractorError,
unescapeHTML,
unified_strdate,
ExtractorError,
unescapeHTML,
unified_strdate,
@@
-45,11
+46,13
@@
class YouPornIE(InfoExtractor):
age_limit = self._rta_search(webpage)
# Get JSON parameters
age_limit = self._rta_search(webpage)
# Get JSON parameters
- json_params = self._search_regex(r'var currentVideo = new Video\((.*)\);', webpage, 'JSON parameters')
+ json_params = self._search_regex(
+ r'var currentVideo = new Video\((.*)\)[,;]',
+ webpage, 'JSON parameters')
try:
params = json.loads(json_params)
except:
try:
params = json.loads(json_params)
except:
- raise ExtractorError(
u
'Invalid JSON')
+ raise ExtractorError('Invalid JSON')
self.report_extraction(video_id)
try:
self.report_extraction(video_id)
try:
@@
-64,7
+67,7
@@
class YouPornIE(InfoExtractor):
# Get all of the links from the page
DOWNLOAD_LIST_RE = r'(?s)<ul class="downloadList">(?P<download_list>.*?)</ul>'
download_list_html = self._search_regex(DOWNLOAD_LIST_RE,
# Get all of the links from the page
DOWNLOAD_LIST_RE = r'(?s)<ul class="downloadList">(?P<download_list>.*?)</ul>'
download_list_html = self._search_regex(DOWNLOAD_LIST_RE,
- webpage, 'download list').strip()
+
webpage, 'download list').strip()
LINK_RE = r'<a href="([^"]+)">'
links = re.findall(LINK_RE, download_list_html)
LINK_RE = r'<a href="([^"]+)">'
links = re.findall(LINK_RE, download_list_html)
@@
-103,7
+106,7
@@
class YouPornIE(InfoExtractor):
self._sort_formats(formats)
if not formats:
self._sort_formats(formats)
if not formats:
- raise ExtractorError(
u
'ERROR: no known formats available for video')
+ raise ExtractorError('ERROR: no known formats available for video')
return {
'id': video_id,
return {
'id': video_id,