backend: Make bitrate attribute private

mopidy · Nov 13, 2014 · d9e2f5c · d9e2f5c
1 parent 71803e0
commit d9e2f5c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/mopidy_spotify/backend.py b/mopidy_spotify/backend.py
@@ -37,8 +37,7 @@ def __init__(self, config, audio):
         self._audio = audio
         self._session = None
         self._event_loop = None
-        # TODO Make `birate` private?
-        self.bitrate = None
+        self._bitrate = None
 
         self.library = library.SpotifyLibraryProvider(backend=self)
         self.playback = playback.SpotifyPlaybackProvider(
@@ -70,8 +69,8 @@ def _get_session(self, config):
 
         session.connection.allow_network = config['spotify']['allow_network']
 
-        self.bitrate = config['spotify']['bitrate']
-        session.preferred_bitrate = BITRATES[self.bitrate]
+        self._bitrate = config['spotify']['bitrate']
+        session.preferred_bitrate = BITRATES[self._bitrate]
         session.volume_normalization = (
             config['spotify']['volume_normalization'])
 

diff --git a/mopidy_spotify/library.py b/mopidy_spotify/library.py
@@ -46,7 +46,7 @@ def lookup(self, uri):
     def _lookup_track(self, sp_link):
         sp_track = sp_link.as_track()
         sp_track.load()
-        track = translator.to_track(sp_track, bitrate=self._backend.bitrate)
+        track = translator.to_track(sp_track, bitrate=self._backend._bitrate)
         if track is not None:
             yield track
 
@@ -56,7 +56,7 @@ def _lookup_album(self, sp_link):
         sp_album_browser.load()
         for sp_track in sp_album_browser.tracks:
             track = translator.to_track(
-                sp_track, bitrate=self._backend.bitrate)
+                sp_track, bitrate=self._backend._bitrate)
             if track is not None:
                 yield track
 
@@ -74,7 +74,7 @@ def _lookup_artist(self, sp_link):
                 continue
             for sp_track in sp_album_browser.tracks:
                 track = translator.to_track(
-                    sp_track, bitrate=self._backend.bitrate)
+                    sp_track, bitrate=self._backend._bitrate)
                 if track is not None:
                     yield track
 
@@ -83,7 +83,7 @@ def _lookup_playlist(self, sp_link):
         sp_playlist.load()
         for sp_track in sp_playlist.tracks:
             track = translator.to_track(
-                sp_track, bitrate=self._backend.bitrate)
+                sp_track, bitrate=self._backend._bitrate)
             if track is not None:
                 yield track
 

diff --git a/mopidy_spotify/playlists.py b/mopidy_spotify/playlists.py
@@ -51,7 +51,7 @@ def lookup(self, uri):
 
         username = self._backend._session.user_name
         return translator.to_playlist(
-            sp_playlist, username=username, bitrate=self._backend.bitrate)
+            sp_playlist, username=username, bitrate=self._backend._bitrate)
 
     @property
     def playlists(self):
@@ -80,7 +80,7 @@ def playlists(self):
 
             playlist = translator.to_playlist(
                 sp_playlist, folders=folders, username=username,
-                bitrate=self._backend.bitrate)
+                bitrate=self._backend._bitrate)
             if playlist is not None:
                 result.append(playlist)
 

diff --git a/tests/test_library.py b/tests/test_library.py
@@ -22,7 +22,7 @@ def backend_mock(session_mock, config):
     backend_mock = mock.Mock(spec=backend.SpotifyBackend)
     backend_mock._config = config
     backend_mock._session = session_mock
-    backend_mock.bitrate = 160
+    backend_mock._bitrate = 160
     return backend_mock
 
 

diff --git a/tests/test_playlists.py b/tests/test_playlists.py
@@ -50,7 +50,7 @@ def session_mock(sp_playlist_mock, sp_user_mock):
 def backend_mock(session_mock):
     backend_mock = mock.Mock(spec=backend.SpotifyBackend)
     backend_mock._session = session_mock
-    backend_mock.bitrate = 160
+    backend_mock._bitrate = 160
     return backend_mock