From 11dba8aa1f0497c5a3ac591d13fe8aec43588705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 9 Jul 2026 13:15:36 +0300 Subject: [PATCH] Reorder extended= param to be first Actually, just re-order paging params to be last This is to keep backward compatible to be able to use url based cache rules with requests-cache --- tests/test_utils.py | 2 +- trakt/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index 3c94218..1869a2e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -73,7 +73,7 @@ def test_build_uri(): assert build_uri('shows/popular', extended='full') == \ 'shows/popular?extended=full' assert build_uri('shows/popular', page=2, extended='full') == \ - 'shows/popular?page=2&extended=full' + 'shows/popular?extended=full&page=2' assert build_uri('shows/popular?sort=rank', page=2) == \ 'shows/popular?sort=rank&page=2' diff --git a/trakt/utils.py b/trakt/utils.py index 3c8537c..4fb3e51 100644 --- a/trakt/utils.py +++ b/trakt/utils.py @@ -101,12 +101,12 @@ def build_uri(uri, page=None, limit=None, extended=None, **params): uri = uri.format(**params) query = [] + if extended: + query.append(('extended', extended)) if page is not None: query.append(('page', _validate_pagination_param('page', page))) if limit is not None: query.append(('limit', _validate_pagination_param('limit', limit))) - if extended: - query.append(('extended', extended)) if query: uri += ('&' if '?' in uri else '?') + urlencode(query)