Refactor: Use build_uri in modules (#126)

Author: glensc

trakt/movies.py

@@ -31,7 +31,8 @@ def dismiss_recommendation(title):
     """Dismiss the movie matching the specified criteria from showing up in
     recommendations.
     """
-    yield 'recommendations/movies/{title}'.format(title=slugify(str(title)))
+    uri = build_uri('recommendations/movies/{title}', title=slugify(str(title)))
+    yield uri
 
 
 @get
@@ -73,7 +74,8 @@ def updated_movies(timestamp=None):
     method.
     """
     ts = timestamp or now()
-    data = yield 'movies/updates/{start_date}'.format(start_date=ts)
+    uri = build_uri('movies/updates/{start_date}', start_date=ts)
+    data = yield uri
     to_ret = []
     for movie in data:
         mov = movie.pop('movie')
@@ -286,7 +288,8 @@ def get_releases(self, country_code='us'):
         :return: a :const:`list` of :class:`Release` objects
         """
         if self._releases is None:
-            data = yield self.ext + '/releases/{cc}'.format(cc=country_code)
+            uri = build_uri(self.ext + '/releases/{cc}', cc=country_code)
+            data = yield uri
             self._releases = [Release(**release) for release in data]
         yield self._releases
 
@@ -299,9 +302,8 @@ def get_translations(self, country_code='us'):
         :return: a :const:`list` of :class:`Translation` objects
         """
         if self._translations is None:
-            data = yield self.ext + '/translations/{cc}'.format(
-                cc=country_code
-            )
+            uri = build_uri(self.ext + '/translations/{cc}', cc=country_code)
+            data = yield uri
             self._translations = [Translation(**translation)
                                   for translation in data]
         yield self._translations

trakt/sync.py

@@ -250,8 +250,7 @@ def get_search_results(query, search_type=None, slugify_query=False):
     if slugify_query:
         query = slugify(query)
 
-    uri = 'search/{type}?query={query}'.format(
-        query=query, type=','.join(search_type))
+    uri = build_uri('search/{type}?query={query}', query=query, type=','.join(search_type))
 
     data = yield uri
 
@@ -324,11 +323,10 @@ def search_by_id(query, id_type='imdb', media_type=None, slugify_query=False):
 
     # If media_type is still none, don't add it as a parameter to the search
     if media_type is None:
-        uri = 'search/{source}/{query}'.format(
-            query=query, source=source)
+        uri = build_uri('search/{source}/{query}', query=query, source=source)
     else:
-        uri = 'search/{source}/{query}?type={media_type}'.format(
-            query=query, source=source, media_type=media_type)
+        uri = build_uri('search/{source}/{query}?type={media_type}',
+                        query=query, source=source, media_type=media_type)
     data = yield uri
 
     results = []
@@ -423,12 +421,15 @@ def get_watchlist(list_type=None, sort=None):
     if sort and sort not in valid_sort:
         raise ValueError('sort must be one of {}'.format(valid_sort))
 
-    uri = 'sync/watchlist'
     if list_type:
-        uri += '/{}'.format(list_type)
-
-    if list_type and sort:
-        uri += '/{}'.format(sort)
+        if sort:
+            uri = build_uri('sync/watchlist/{list_type}/{sort}',
+                            list_type=list_type, sort=sort)
+        else:
+            uri = build_uri('sync/watchlist/{list_type}',
+                            list_type=list_type)
+    else:
+        uri = build_uri('sync/watchlist')
 
     data = yield uri
     results = []

trakt/tv.py

@@ -31,11 +31,12 @@ class Translation(NamedTuple):
 
 
 @delete
-def dismiss_recommendation(title=None):
+def dismiss_recommendation(title):
     """Dismiss the show matching the specified criteria from showing up in
     recommendations.
     """
-    yield 'recommendations/shows/{title}'.format(title=title)
+    uri = build_uri('recommendations/shows/{title}', title=title)
+    yield uri
 
 
 @get
@@ -493,9 +494,8 @@ def get_translations(self, country_code='us'):
         :return: a :const:`list` of :class:`Translation` objects
         """
         if self._translations is None:
-            data = yield self.ext + '/translations/{cc}'.format(
-                cc=country_code
-            )
+            uri = build_uri(self.ext + '/translations/{cc}', cc=country_code)
+            data = yield uri
             self._translations = [Translation(**translation)
                                   for translation in data]
         yield self._translations

trakt/users.py

@@ -24,11 +24,13 @@ class Request(NamedTuple):
 
     @post
     def approve(self):
-        yield 'users/requests/{id}'.format(id=self.id)
+        uri = build_uri('users/requests/{id}', id=self.id)
+        yield uri
 
     @delete
     def deny(self):
-        yield 'users/requests/{id}'.format(id=self.id)
+        uri = build_uri('users/requests/{id}', id=self.id)
+        yield uri
 
 
 @post
@@ -37,7 +39,8 @@ def follow(user_name):
     follow request will be in a pending state. If they have a public profile,
     they will be followed immediately.
     """
-    yield 'users/{username}/follow'.format(username=slugify(user_name))
+    uri = build_uri('users/{username}/follow', username=slugify(user_name))
+    yield uri
 
 
 @get
@@ -64,7 +67,8 @@ def get_user_settings():
 def unfollow(user_name):
     """Unfollow a user you're currently following with a username of *user_name*
     """
-    yield 'users/{username}/follow'.format(username=slugify(user_name))
+    uri = build_uri('users/{username}/follow', username=slugify(user_name))
+    yield uri
 
 
 @dataclass(frozen=True)
@@ -226,7 +230,8 @@ def create(cls, name, creator, description=None, privacy='private',
                 'allow_comments': allow_comments}
         if description is not None:
             args['description'] = description
-        data = yield 'users/{user}/lists'.format(user=slugify(creator)), args
+        uri = build_uri('users/{user}/lists', user=slugify(creator))
+        data = yield uri, args
         yield cls(creator=creator, user=creator, **data)
 
     @classmethod
@@ -236,8 +241,9 @@ def _get(cls, title, creator):
 
         :param title: Name of the list.
         """
-        data = yield 'users/{user}/lists/{id}'.format(user=slugify(creator),
-                                                      id=slugify(title))
+        uri = build_uri('users/{user}/lists/{id}', user=slugify(creator),
+                        id=slugify(title))
+        data = yield uri
         ulist = cls(creator=creator, **data)
         ulist.get_items()
 
@@ -250,8 +256,9 @@ def get_items(self):
 
         """
 
-        data = yield 'users/{user}/lists/{id}/items'.format(
-            user=slugify(self.creator), id=self.slug)
+        uri = build_uri('users/{user}/lists/{id}/items',
+                        user=slugify(self.creator), id=self.slug)
+        data = yield uri
 
         for item in data:
             # match list item type
@@ -290,23 +297,25 @@ def add_items(self, *items):
         people = [p.ids for p in items if isinstance(p, Person)]
         self._items = items
         args = {'movies': movies, 'shows': shows, 'people': people}
-        uri = 'users/{user}/lists/{id}/items'.format(
-            user=slugify(self.creator), id=self.trakt)
+        uri = build_uri('users/{user}/lists/{id}/items',
+                        user=slugify(self.creator), id=self.trakt)
         yield uri, args
 
     @delete
     def delete_list(self):
         """Delete this :class:`UserList`"""
-        yield 'users/{user}/lists/{id}'.format(user=slugify(self.creator),
-                                               id=self.trakt)
+        uri = build_uri('users/{user}/lists/{id}', user=slugify(self.creator),
+                        id=self.trakt)
+        yield uri
 
     @post
     def like(self):
         """Like this :class:`UserList`. Likes help determine popular lists.
         Only one like is allowed per list per user.
         """
-        uri = 'users/{user}/lists/{id}/like'
-        yield uri.format(user=slugify(self.creator), id=self.trakt), None
+        uri = build_uri('users/{user}/lists/{id}/like',
+                        user=slugify(self.creator), id=self.trakt)
+        yield uri, None
 
     @post
     def remove_items(self, *items):
@@ -317,15 +326,16 @@ def remove_items(self, *items):
         people = [p.ids for p in items if isinstance(p, Person)]
         self._items = items
         args = {'movies': movies, 'shows': shows, 'people': people}
-        uri = 'users/{user}/lists/{id}/items/remove'.format(
-            user=slugify(self.creator), id=self.trakt)
+        uri = build_uri('users/{user}/lists/{id}/items/remove',
+                        user=slugify(self.creator), id=self.trakt)
         yield uri, args
 
     @delete
     def unlike(self):
         """Remove a like on this :class:`UserList`."""
-        uri = 'users/{username}/lists/{id}/like'
-        yield uri.format(username=slugify(self.creator), id=self.trakt)
+        uri = build_uri('users/{username}/lists/{id}/like',
+                        username=slugify(self.creator), id=self.trakt)
+        yield uri
 
 
 class User:
@@ -353,7 +363,8 @@ def __init__(self, username, **kwargs):
     @get
     def _get(self):
         """Get this :class:`User` from the trakt.tv API"""
-        data = yield 'users/{username}'.format(username=slugify(self.username))
+        uri = build_uri('users/{username}', username=slugify(self.username))
+        data = yield uri
         self._build(data)
 
     def _build(self, data):
@@ -370,8 +381,8 @@ def followers(self):
         display data either.
         """
         if self._followers is None:
-            data = yield 'users/{user}/followers'.format(
-                user=slugify(self.username))
+            uri = build_uri('users/{user}/followers', user=slugify(self.username))
+            data = yield uri
             self._followers = []
             for user in data:
                 user_data = user.pop('user')
@@ -388,8 +399,8 @@ def following(self):
         that are protected won't display data either.
         """
         if self._following is None:
-            data = yield 'users/{user}/following'.format(
-                user=slugify(self.username))
+            uri = build_uri('users/{user}/following', user=slugify(self.username))
+            data = yield uri
             self._following = []
             for user in data:
                 user_data = user.pop('user')
@@ -408,8 +419,8 @@ def friends(self):
         """
         if self._friends is None:
             self._friends = []
-            data = yield 'users/{user}/friends'.format(
-                user=slugify(self.username))
+            uri = build_uri('users/{user}/friends', user=slugify(self.username))
+            data = yield uri
             for user in data:
                 user_data = user.pop('user')
                 date = user.pop('friends_at')
@@ -424,8 +435,8 @@ def lists(self):
         lists, you will need to authenticate as yourself.
         """
         if self._lists is None:
-            data = yield 'users/{username}/lists'.format(
-                username=slugify(self.username))
+            uri = build_uri('users/{username}/lists', username=slugify(self.username))
+            data = yield uri
             for ul in data:
                 if "user" in ul:
                     # user will be replaced with the self User object
@@ -556,9 +567,8 @@ def watched_shows(self):
         collection.
         """
         if self._watched_shows is None:
-            data = yield 'users/{user}/watched/shows'.format(
-                user=slugify(self.username)
-            )
+            uri = build_uri('users/{user}/watched/shows', user=slugify(self.username))
+            data = yield uri
             self._watched_shows = []
             for show in data:
                 show_data = show.pop('show')
@@ -574,8 +584,8 @@ def watching(self):
         will be returned. Protected users won't return any data unless you are
         friends.
         """
-        data = yield 'users/{user}/watching'.format(
-            user=slugify(self.username))
+        uri = build_uri('users/{user}/watching', user=slugify(self.username))
+        data = yield uri
 
         # if a user isn't watching anything, trakt returns a 204
         if data is None or data == '':
@@ -616,10 +626,13 @@ def get_ratings(self, media_type='movies', rating=None):
             'movies', 'shows', 'seasons', 'episodes'
         :param rating: Optional rating between 1 and 10
         """
-        uri = 'users/{user}/ratings/{type}'.format(user=slugify(self.username),
-                                                   type=media_type)
         if rating is not None:
-            uri += '/{rating}'.format(rating=rating)
+            uri = build_uri('users/{user}/ratings/{type}/{rating}',
+                            user=slugify(self.username), type=media_type,
+                            rating=rating)
+        else:
+            uri = build_uri('users/{user}/ratings/{type}',
+                            user=slugify(self.username), type=media_type)
         data = yield uri
         # TODO (moogar0880) - return as objects
         yield data
@@ -629,7 +642,8 @@ def get_stats(self):
         """Returns stats about the movies, shows, and episodes a user has
         watched and collected
         """
-        data = yield 'users/{user}/stats'.format(user=slugify(self.username))
+        uri = build_uri('users/{user}/stats', user=slugify(self.username))
+        data = yield uri
         yield data
 
     @get