projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dailymotion] Replace test
[youtube-dl]
/
youtube_dl
/
extractor
/
niconico.py
diff --git
a/youtube_dl/extractor/niconico.py
b/youtube_dl/extractor/niconico.py
index 3b5784e8f5cb5ae8014c4f51d2d451d989b87860..4c18904169d3f69a0bf7e95fb21d98218bca7e91 100644
(file)
--- a/
youtube_dl/extractor/niconico.py
+++ b/
youtube_dl/extractor/niconico.py
@@
-5,14
+5,16
@@
import re
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse,
compat_urllib_request,
compat_urlparse,
compat_urllib_parse,
compat_urllib_request,
compat_urlparse,
- unified_strdate,
- parse_duration,
- int_or_none,
+)
+from ..utils import (
ExtractorError,
ExtractorError,
+ int_or_none,
+ parse_duration,
+ unified_strdate,
)
)
@@
-111,7
+113,7
@@
class NiconicoIE(InfoExtractor):
if 'deleted=' in flv_info_webpage:
raise ExtractorError('The video has been deleted.',
if 'deleted=' in flv_info_webpage:
raise ExtractorError('The video has been deleted.',
- expected=True)
+
expected=True)
video_real_url = compat_urlparse.parse_qs(flv_info_webpage)['url'][0]
# Start extracting information
video_real_url = compat_urlparse.parse_qs(flv_info_webpage)['url'][0]
# Start extracting information
@@
-170,13
+172,13
@@
class NiconicoPlaylistIE(InfoExtractor):
webpage = self._download_webpage(url, list_id)
entries_json = self._search_regex(r'Mylist\.preload\(\d+, (\[.*\])\);',
webpage = self._download_webpage(url, list_id)
entries_json = self._search_regex(r'Mylist\.preload\(\d+, (\[.*\])\);',
- webpage, 'entries')
+
webpage, 'entries')
entries = json.loads(entries_json)
entries = [{
'_type': 'url',
'ie_key': NiconicoIE.ie_key(),
'url': ('http://www.nicovideo.jp/watch/%s' %
entries = json.loads(entries_json)
entries = [{
'_type': 'url',
'ie_key': NiconicoIE.ie_key(),
'url': ('http://www.nicovideo.jp/watch/%s' %
- entry['item_data']['video_id']),
+
entry['item_data']['video_id']),
} for entry in entries]
return {
} for entry in entries]
return {