From 92ebb3f7f9a2b13e34e8f79e6339ed15d2fcb04c Mon Sep 17 00:00:00 2001 From: leo-dor Date: Tue, 19 May 2015 17:24:40 +0000 Subject: [PATCH 1/2] Replaced '?' with '_' in all test filenames which contained it --- ...s?page=1&per_page=50.json => releases_page=1&per_page=50.json} | 0 ...s?page=2&per_page=50.json => releases_page=2&per_page=50.json} | 0 ...s?per_page=50&page=1.json => releases_per_page=50&page=1.json} | 0 ...s?per_page=50&page=2.json => releases_per_page=50&page=2.json} | 0 ...50&q=trash80.json => search_page=1&per_page=50&q=trash80.json} | 0 ...&per_page=50.json => search_page=1&q=trash80&per_page=50.json} | 0 ...=1&q=trash80.json => search_per_page=50&page=1&q=trash80.json} | 0 ...ash80&page=1.json => search_per_page=50&q=trash80&page=1.json} | 0 ...&per_page=50.json => search_q=trash80&page=1&per_page=50.json} | 0 ...ge=50&page=1.json => search_q=trash80&per_page=50&page=1.json} | 0 ...s?page=1&per_page=50.json => versions_page=1&per_page=50.json} | 0 ...s?per_page=50&page=1.json => versions_per_page=50&page=1.json} | 0 ...ants?page=1&per_page=50.json => wants_page=1&per_page=50.json} | 0 ...ants?per_page=50&page=1.json => wants_per_page=50&page=1.json} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename discogs_client/tests/res/artists/1/{releases?page=1&per_page=50.json => releases_page=1&per_page=50.json} (100%) rename discogs_client/tests/res/artists/1/{releases?page=2&per_page=50.json => releases_page=2&per_page=50.json} (100%) rename discogs_client/tests/res/artists/1/{releases?per_page=50&page=1.json => releases_per_page=50&page=1.json} (100%) rename discogs_client/tests/res/artists/1/{releases?per_page=50&page=2.json => releases_per_page=50&page=2.json} (100%) rename discogs_client/tests/res/database/{search?page=1&per_page=50&q=trash80.json => search_page=1&per_page=50&q=trash80.json} (100%) rename discogs_client/tests/res/database/{search?page=1&q=trash80&per_page=50.json => search_page=1&q=trash80&per_page=50.json} (100%) rename discogs_client/tests/res/database/{search?per_page=50&page=1&q=trash80.json => search_per_page=50&page=1&q=trash80.json} (100%) rename discogs_client/tests/res/database/{search?per_page=50&q=trash80&page=1.json => search_per_page=50&q=trash80&page=1.json} (100%) rename discogs_client/tests/res/database/{search?q=trash80&page=1&per_page=50.json => search_q=trash80&page=1&per_page=50.json} (100%) rename discogs_client/tests/res/database/{search?q=trash80&per_page=50&page=1.json => search_q=trash80&per_page=50&page=1.json} (100%) rename discogs_client/tests/res/masters/4242/{versions?page=1&per_page=50.json => versions_page=1&per_page=50.json} (100%) rename discogs_client/tests/res/masters/4242/{versions?per_page=50&page=1.json => versions_per_page=50&page=1.json} (100%) rename discogs_client/tests/res/users/example/{wants?page=1&per_page=50.json => wants_page=1&per_page=50.json} (100%) rename discogs_client/tests/res/users/example/{wants?per_page=50&page=1.json => wants_per_page=50&page=1.json} (100%) diff --git a/discogs_client/tests/res/artists/1/releases?page=1&per_page=50.json b/discogs_client/tests/res/artists/1/releases_page=1&per_page=50.json similarity index 100% rename from discogs_client/tests/res/artists/1/releases?page=1&per_page=50.json rename to discogs_client/tests/res/artists/1/releases_page=1&per_page=50.json diff --git a/discogs_client/tests/res/artists/1/releases?page=2&per_page=50.json b/discogs_client/tests/res/artists/1/releases_page=2&per_page=50.json similarity index 100% rename from discogs_client/tests/res/artists/1/releases?page=2&per_page=50.json rename to discogs_client/tests/res/artists/1/releases_page=2&per_page=50.json diff --git a/discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json b/discogs_client/tests/res/artists/1/releases_per_page=50&page=1.json similarity index 100% rename from discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json rename to discogs_client/tests/res/artists/1/releases_per_page=50&page=1.json diff --git a/discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json b/discogs_client/tests/res/artists/1/releases_per_page=50&page=2.json similarity index 100% rename from discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json rename to discogs_client/tests/res/artists/1/releases_per_page=50&page=2.json diff --git a/discogs_client/tests/res/database/search?page=1&per_page=50&q=trash80.json b/discogs_client/tests/res/database/search_page=1&per_page=50&q=trash80.json similarity index 100% rename from discogs_client/tests/res/database/search?page=1&per_page=50&q=trash80.json rename to discogs_client/tests/res/database/search_page=1&per_page=50&q=trash80.json diff --git a/discogs_client/tests/res/database/search?page=1&q=trash80&per_page=50.json b/discogs_client/tests/res/database/search_page=1&q=trash80&per_page=50.json similarity index 100% rename from discogs_client/tests/res/database/search?page=1&q=trash80&per_page=50.json rename to discogs_client/tests/res/database/search_page=1&q=trash80&per_page=50.json diff --git a/discogs_client/tests/res/database/search?per_page=50&page=1&q=trash80.json b/discogs_client/tests/res/database/search_per_page=50&page=1&q=trash80.json similarity index 100% rename from discogs_client/tests/res/database/search?per_page=50&page=1&q=trash80.json rename to discogs_client/tests/res/database/search_per_page=50&page=1&q=trash80.json diff --git a/discogs_client/tests/res/database/search?per_page=50&q=trash80&page=1.json b/discogs_client/tests/res/database/search_per_page=50&q=trash80&page=1.json similarity index 100% rename from discogs_client/tests/res/database/search?per_page=50&q=trash80&page=1.json rename to discogs_client/tests/res/database/search_per_page=50&q=trash80&page=1.json diff --git a/discogs_client/tests/res/database/search?q=trash80&page=1&per_page=50.json b/discogs_client/tests/res/database/search_q=trash80&page=1&per_page=50.json similarity index 100% rename from discogs_client/tests/res/database/search?q=trash80&page=1&per_page=50.json rename to discogs_client/tests/res/database/search_q=trash80&page=1&per_page=50.json diff --git a/discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json b/discogs_client/tests/res/database/search_q=trash80&per_page=50&page=1.json similarity index 100% rename from discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json rename to discogs_client/tests/res/database/search_q=trash80&per_page=50&page=1.json diff --git a/discogs_client/tests/res/masters/4242/versions?page=1&per_page=50.json b/discogs_client/tests/res/masters/4242/versions_page=1&per_page=50.json similarity index 100% rename from discogs_client/tests/res/masters/4242/versions?page=1&per_page=50.json rename to discogs_client/tests/res/masters/4242/versions_page=1&per_page=50.json diff --git a/discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json b/discogs_client/tests/res/masters/4242/versions_per_page=50&page=1.json similarity index 100% rename from discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json rename to discogs_client/tests/res/masters/4242/versions_per_page=50&page=1.json diff --git a/discogs_client/tests/res/users/example/wants?page=1&per_page=50.json b/discogs_client/tests/res/users/example/wants_page=1&per_page=50.json similarity index 100% rename from discogs_client/tests/res/users/example/wants?page=1&per_page=50.json rename to discogs_client/tests/res/users/example/wants_page=1&per_page=50.json diff --git a/discogs_client/tests/res/users/example/wants?per_page=50&page=1.json b/discogs_client/tests/res/users/example/wants_per_page=50&page=1.json similarity index 100% rename from discogs_client/tests/res/users/example/wants?per_page=50&page=1.json rename to discogs_client/tests/res/users/example/wants_per_page=50&page=1.json From 674f6d63f70c25d0a2f1cea0e3d410bf4afdfcf5 Mon Sep 17 00:00:00 2001 From: leo-dor Date: Tue, 19 May 2015 20:41:02 +0300 Subject: [PATCH 2/2] FilesystemFetcher now replaces '?' with '_' in paths. This fixes Issue 37. --- discogs_client/fetchers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/discogs_client/fetchers.py b/discogs_client/fetchers.py index 94d5f30..9497201 100644 --- a/discogs_client/fetchers.py +++ b/discogs_client/fetchers.py @@ -94,6 +94,7 @@ def __init__(self, base_path): def fetch(self, client, method, url, data=None, headers=None, json=True): url = url.replace(client._base_url, '') + url = url.replace('?', '_') # this fixes Issue 37 if json: base_name = ''.join((url[1:], '.json'))