Sync branches (#667)

CHANGELOG.md

@@ -14,13 +14,6 @@ Rebasing master onto v3 doesn't require a changelog update.
 
 * `Scope` - An enum which contains all of the authorization scopes (see [here](https://github.com/plamere/spotipy/issues/652#issuecomment-797461311)).
 
-* Added the following endpoints
-    * `Spotify.current_user_saved_episodes`
-    * `Spotify.current_user_saved_episodes_add`
-    * `Spotify.current_user_saved_episodes_delete`
-    * `Spotify.current_user_saved_episodes_contains`
-    * `Spotify.available_markets`
-
 ### Changed
 
 * Made `CacheHandler` an abstract base class
@@ -36,6 +29,12 @@ Rebasing master onto v3 doesn't require a changelog update.
 
 - Enabled using both short and long IDs for playlist_change_details
 - Added a cache handler to `SpotifyClientCredentials`
+- Added the following endpoints
+    * `Spotify.current_user_saved_episodes`
+    * `Spotify.current_user_saved_episodes_add`
+    * `Spotify.current_user_saved_episodes_delete`
+    * `Spotify.current_user_saved_episodes_contains`
+    * `Spotify.available_markets`
 
 ### Changed
 

examples/artist_discography.py

@@ -1,3 +1,4 @@
+#Shows the list of all songs sung by the artist or the band
 import argparse
 import logging
 

examples/simple3.py

@@ -1,3 +1,4 @@
+#Shows the name of the artist/band and their image by giving a link
 import sys
 
 from spotipy.oauth2 import SpotifyClientCredentials

spotipy/client.py

@@ -1221,7 +1221,6 @@ class Spotify(object):
                 - limit - the number of tracks to return
                 - offset - the index of the first track to return
                 - market - an ISO 3166-1 alpha-2 country code
-
         """
         return self._get("me/tracks", limit=limit, offset=offset, market=market)
 
@@ -1347,6 +1346,7 @@ class Spotify(object):
             Parameters:
                 - shows - a list of show URIs, URLs or IDs
         """
+
         slist = [self._get_id("show", s) for s in shows]
         return self._get("me/shows/contains?ids=" + ",".join(slist))
 
@@ -1878,7 +1878,6 @@ class Spotify(object):
 
     def available_markets(self):
         """ Get the list of markets where Spotify is available.
-
             Returns a list of the countries in which Spotify is available, identified by their
             ISO 3166-1 alpha-2 country code with additional country codes for special territories.
         """