diff --git a/VERSION b/VERSION index f37ae4a..b830554 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.19 \ No newline at end of file +1.2.20 \ No newline at end of file diff --git a/tmdbapis/objs/pagination.py b/tmdbapis/objs/pagination.py index dbd20ae..7d1eb9b 100644 --- a/tmdbapis/objs/pagination.py +++ b/tmdbapis/objs/pagination.py @@ -59,7 +59,7 @@ def load_next(self): Raises: :class:`~tmdbapis.exceptions.Invalid`: When ``start_date`` or ``end_date`` is in an incorrect format. """ - if self.page + 1 > self.total_pages: + if self.page + 1 > self.total_pages or self.page + 1 > 500: raise NotFound("No Next Page") self.load_page(self.page + 1) @@ -73,8 +73,8 @@ def load_page(self, page: int): :class:`~tmdbapis.exceptions.Invalid`: When ``page`` is not in the range of valid page numbers. """ page = int(page) - if page < 1 or page > self.total_pages: - raise Invalid(f"Page must be an integer 1-{self.total_pages}") + if page < 1 or page > self.total_pages or page > 500: + raise Invalid(f"Page must be an integer 1-{'500' if self.total_pages > 500 else self.total_pages}") if page in self._page_storage: self._loading = True self.results = self._page_storage[page] diff --git a/tmdbapis/tmdb.py b/tmdbapis/tmdb.py index 2f54532..2f06252 100644 --- a/tmdbapis/tmdb.py +++ b/tmdbapis/tmdb.py @@ -388,8 +388,6 @@ def _validate_discover(self, is_movie, **kwargs): raise Invalid(f"{k} must be a number greater than 0.0") validated[k] = float(v) elif k == "with_watch_monetization_types": - if v not in ["flatrate", "free", "ads", "rent", "buy"]: - raise Invalid(f"{v} is not a valid with_watch_monetization_types option. Options: [flatrate, free, ads, rent, or buy]") if "watch_region" not in kwargs: raise Invalid("with_watch_monetization_types must be used with watch_region") validated[k] = v