projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[compat] Add compat_urllib_parse_urlencode and eliminate encode_dict
[youtube-dl]
/
youtube_dl
/
extractor
/
soundcloud.py
diff --git
a/youtube_dl/extractor/soundcloud.py
b/youtube_dl/extractor/soundcloud.py
index 1efb2b980cc83bc5ffa3b14c912188973b4574b7..2bca8fa3a0db5a9bf419df78844cd8eafb822454 100644
(file)
--- a/
youtube_dl/extractor/soundcloud.py
+++ b/
youtube_dl/extractor/soundcloud.py
@@
-11,10
+11,9
@@
from .common import (
from ..compat import (
compat_str,
compat_urlparse,
from ..compat import (
compat_str,
compat_urlparse,
- compat_urllib_parse,
+ compat_urllib_parse
_urlencode
,
)
from ..utils import (
)
from ..utils import (
- encode_dict,
ExtractorError,
int_or_none,
unified_strdate,
ExtractorError,
int_or_none,
unified_strdate,
@@
-393,7
+392,7
@@
class SoundcloudUserIE(SoundcloudIE):
query = COMMON_QUERY.copy()
query['offset'] = 0
query = COMMON_QUERY.copy()
query['offset'] = 0
- next_href = base_url + '?' + compat_urllib_parse
.
urlencode(query)
+ next_href = base_url + '?' + compat_urllib_parse
_
urlencode(query)
entries = []
for i in itertools.count():
entries = []
for i in itertools.count():
@@
-424,7
+423,7
@@
class SoundcloudUserIE(SoundcloudIE):
qs = compat_urlparse.parse_qs(parsed_next_href.query)
qs.update(COMMON_QUERY)
next_href = compat_urlparse.urlunparse(
qs = compat_urlparse.parse_qs(parsed_next_href.query)
qs.update(COMMON_QUERY)
next_href = compat_urlparse.urlunparse(
- parsed_next_href._replace(query=compat_urllib_parse
.
urlencode(qs, True)))
+ parsed_next_href._replace(query=compat_urllib_parse
_
urlencode(qs, True)))
return {
'_type': 'playlist',
return {
'_type': 'playlist',
@@
-460,7
+459,7
@@
class SoundcloudPlaylistIE(SoundcloudIE):
if token:
data_dict['secret_token'] = token
if token:
data_dict['secret_token'] = token
- data = compat_urllib_parse
.
urlencode(data_dict)
+ data = compat_urllib_parse
_
urlencode(data_dict)
data = self._download_json(
base_url + data, playlist_id, 'Downloading playlist')
data = self._download_json(
base_url + data, playlist_id, 'Downloading playlist')
@@
-500,7
+499,8
@@
class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
query['client_id'] = self._CLIENT_ID
query['linked_partitioning'] = '1'
query['offset'] = 0
query['client_id'] = self._CLIENT_ID
query['linked_partitioning'] = '1'
query['offset'] = 0
- data = compat_urllib_parse.urlencode(encode_dict(query))
+ data = compat_urllib_parse_urlencode(query)
+ data = compat_urllib_parse_urlencode(query)
next_url = '{0}{1}?{2}'.format(self._API_V2_BASE, endpoint, data)
collected_results = 0
next_url = '{0}{1}?{2}'.format(self._API_V2_BASE, endpoint, data)
collected_results = 0