From 5b2f8bb79b4fb2e091a0603575f41b8d3c0ce565 Mon Sep 17 00:00:00 2001 From: Harm van Zeeland Date: Mon, 19 Oct 2020 16:08:01 +0200 Subject: [PATCH 1/2] Replace basestring with str (python 3 support) --- mopidy_json_client/messages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mopidy_json_client/messages.py b/mopidy_json_client/messages.py index 01249b3..b73225d 100755 --- a/mopidy_json_client/messages.py +++ b/mopidy_json_client/messages.py @@ -151,7 +151,7 @@ def format_app_error(input_error): output['title'] = input_error.get('message') inner_data = input_error.get('data') - if isinstance(inner_data, basestring): + if isinstance(inner_data, str): output['error'] = inner_data elif 'message' in input_error: output['error'] = inner_data.get('message') From 3896569f36e432b7f3bd7fdc4215172d0edfa0f8 Mon Sep 17 00:00:00 2001 From: Harm van Zeeland Date: Mon, 19 Oct 2020 16:10:38 +0200 Subject: [PATCH 2/2] Remove deprecated uri argument (https://github.com/ismailof/mopidy-json-client/issues/26) --- mopidy_json_client/methods_2_0/tracklist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mopidy_json_client/methods_2_0/tracklist.py b/mopidy_json_client/methods_2_0/tracklist.py index 26737f0..7f5837b 100644 --- a/mopidy_json_client/methods_2_0/tracklist.py +++ b/mopidy_json_client/methods_2_0/tracklist.py @@ -109,7 +109,7 @@ def add(self, tracks=None, at_position=None, uri=None, uris=None, **options): .. deprecated:: 1.0 The ``tracks`` and ``uri`` arguments. Use ``uris``. ''' - return self.mopidy_request('core.tracklist.add', tracks=tracks, at_position=at_position, uri=uri, uris=uris, **options) + return self.mopidy_request('core.tracklist.add', tracks=tracks, at_position=at_position, uris=uris, **options) def get_eot_tlid(self, **options): '''The TLID of the track that will be played after the current track.