projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86e1958
)
[vrv] Fix extraction on python2 (closes #15928)
author
Joseph Spiros
<joseph@josephspiros.com>
Sat, 24 Mar 2018 07:57:34 +0000
(
03:57
-0400)
committer
Sergey M
<dstftw@gmail.com>
Sat, 24 Mar 2018 07:57:34 +0000
(14:57 +0700)
youtube_dl/extractor/vrv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vrv.py
b/youtube_dl/extractor/vrv.py
index 9959627c0ad3690e02594bc10b9633c023604f7e..64b13f0ed00f6f58e6eea6d88bacb04f7a3f757d 100644
(file)
--- a/
youtube_dl/extractor/vrv.py
+++ b/
youtube_dl/extractor/vrv.py
@@
-12,7
+12,7
@@
import time
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse_urlencode,
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse_urlencode,
- compat_urlparse,
+ compat_url
lib_
parse,
)
from ..utils import (
float_or_none,
)
from ..utils import (
float_or_none,
@@
-39,11
+39,11
@@
class VRVBaseIE(InfoExtractor):
data = json.dumps(data).encode()
headers['Content-Type'] = 'application/json'
method = 'POST' if data else 'GET'
data = json.dumps(data).encode()
headers['Content-Type'] = 'application/json'
method = 'POST' if data else 'GET'
- base_string = '&'.join([method, compat_url
parse.quote(base_url, ''), compat_url
parse.quote(encoded_query, '')])
+ base_string = '&'.join([method, compat_url
lib_parse.quote(base_url, ''), compat_urllib_
parse.quote(encoded_query, '')])
oauth_signature = base64.b64encode(hmac.new(
(self._API_PARAMS['oAuthSecret'] + '&').encode('ascii'),
base_string.encode(), hashlib.sha1).digest()).decode()
oauth_signature = base64.b64encode(hmac.new(
(self._API_PARAMS['oAuthSecret'] + '&').encode('ascii'),
base_string.encode(), hashlib.sha1).digest()).decode()
- encoded_query += '&oauth_signature=' + compat_urlparse.quote(oauth_signature, '')
+ encoded_query += '&oauth_signature=' + compat_url
lib_
parse.quote(oauth_signature, '')
return self._download_json(
'?'.join([base_url, encoded_query]), video_id,
note='Downloading %s JSON metadata' % note, headers=headers, data=data)
return self._download_json(
'?'.join([base_url, encoded_query]), video_id,
note='Downloading %s JSON metadata' % note, headers=headers, data=data)