From 08b7d199f7fb5b9772f52bc2374bf102f738732c Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 17 Jan 2014 23:52:18 +0100 Subject: [PATCH] review: Typos and code formating --- mopidy/backend.py | 4 ++-- mopidy/core/library.py | 4 ++-- mopidy/local/json.py | 2 +- mopidy/local/translator.py | 2 +- mopidy/mpd/dispatcher.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mopidy/backend.py b/mopidy/backend.py index 8105034a..6f895985 100644 --- a/mopidy/backend.py +++ b/mopidy/backend.py @@ -57,8 +57,8 @@ class LibraryProvider(object): root_directory = None """ - :class:`models.Ref.directory` instance with an uri and name set - representing the root of this libraries browse tree. URIs must + :class:`models.Ref.directory` instance with a URI and name set + representing the root of this library's browse tree. URIs must use one of the schemes supported by the backend, and name should be set to a human friendly value. diff --git a/mopidy/core/library.py b/mopidy/core/library.py index 8eddfdbe..aaebb129 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -52,12 +52,12 @@ class LibraryController(object): The only valid exception to this is checking the scheme, as it is used to route browse requests to the correct backend. - For example, the dummy library's ``/bar`` directory could bereturned + For example, the dummy library's ``/bar`` directory could be returned like this:: Ref.directory(uri='dummy:directory:/bar', name='bar') - :param bytestring uri: uri to browse + :param string uri: URI to browse :rtype: list of :class:`mopidy.models.Ref` """ if uri is None: diff --git a/mopidy/local/json.py b/mopidy/local/json.py index f25b3813..b87c5bce 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -62,7 +62,7 @@ class _BrowseCache(object): for i in range(len(parts)): self._cache.setdefault(parent, collections.OrderedDict()) - directory = b'/'.join(parts[:i+1]) + directory = '/'.join(parts[:i+1]) dir_uri = translator.path_to_local_directory_uri(directory) dir_ref = models.Ref.directory(uri=dir_uri, name=parts[i]) self._cache[parent][dir_uri] = dir_ref diff --git a/mopidy/local/translator.py b/mopidy/local/translator.py index 7d28be01..c3f9874b 100644 --- a/mopidy/local/translator.py +++ b/mopidy/local/translator.py @@ -34,7 +34,7 @@ def path_to_local_track_uri(relpath): def path_to_local_directory_uri(relpath): - """Convert path releative to media_dir to local directory URI.""" + """Convert path relative to :confval:`local/media_dir` directory URI.""" if isinstance(relpath, unicode): relpath = relpath.encode('utf-8') return b'local:directory:%s' % urllib.quote(relpath) diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py index c269a5b3..976c6e32 100644 --- a/mopidy/mpd/dispatcher.py +++ b/mopidy/mpd/dispatcher.py @@ -302,7 +302,7 @@ class MpdContext(object): uri = None for part in parts: for ref in self.core.library.browse(uri).get(): - if ref.type == ref.DIRECTORY and part == ref.name: + if ref.type == ref.DIRECTORY and ref.name == part: uri = ref.uri break else: