Merge branch 'master' into support_changing_playlist_details

Conflicts:
	spotipy/client.py
This commit is contained in:
Nathan Coleman 2016-11-15 12:43:35 -06:00
commit 7867c4fe28

View File

@ -709,13 +709,13 @@ class Spotify(object):
'''
params = dict(limit=limit)
if seed_artists:
params['seed_artists'] = [self._get_id('artist', a)
for a in seed_artists]
params['seed_artists'] = ','.join(
[self._get_id('artist', a) for a in seed_artists])
if seed_genres:
params['seed_genres'] = seed_genres
params['seed_genres'] = ','.join(seed_genres)
if seed_tracks:
params['seed_tracks'] = [self._get_id('track', t)
for t in seed_tracks]
params['seed_tracks'] = ','.join(
[self._get_id('track', t) for t in seed_tracks])
if country:
params['market'] = country