projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d050de7
)
Fix blip.tv in python3
author
Philipp Hagemeister
<phihag@phihag.de>
Tue, 11 Dec 2012 16:00:11 +0000
(17:00 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Tue, 11 Dec 2012 16:00:11 +0000
(17:00 +0100)
youtube_dl/InfoExtractors.py
patch
|
blob
|
history
diff --git
a/youtube_dl/InfoExtractors.py
b/youtube_dl/InfoExtractors.py
index 9cfff153b12fce1c4db4c1420b6f0caab323a8c2..1d774b91e7d0ea6fb3a409ad04acfb375d35b3ba 100644
(file)
--- a/
youtube_dl/InfoExtractors.py
+++ b/
youtube_dl/InfoExtractors.py
@@
-2262,7
+2262,7
@@
class BlipTVIE(InfoExtractor):
else:
cchar = '?'
json_url = url + cchar + 'skin=json&version=2&no_wrap=1'
else:
cchar = '?'
json_url = url + cchar + 'skin=json&version=2&no_wrap=1'
- request = compat_urllib_request.Request(json_url
.encode('utf-8')
)
+ request = compat_urllib_request.Request(json_url)
self.report_extraction(mobj.group(1))
info = None
try:
self.report_extraction(mobj.group(1))
info = None
try:
@@
-2287,7
+2287,8
@@
class BlipTVIE(InfoExtractor):
return
if info is None: # Regular URL
try:
return
if info is None: # Regular URL
try:
- json_code = urlh.read()
+ json_code_bytes = urlh.read()
+ json_code = json_code_bytes.decode('utf-8')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % compat_str(err))
return
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % compat_str(err))
return