Skip to content

Replace basestring and fix #26 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarmvZ wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace basestring and fix #26 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b2f8bb
Replace basestring with str (python 3 support)
HarmvZ Oct 19, 2020
3896569
Remove deprecated uri argument (https://github.com/ismailof/mopidy-js…
HarmvZ Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mopidy_json_client/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion mopidy_json_client/methods_2_0/tracklist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down