Remove logger, align naming convention for test parameters.

4 files changed, 12 insertions, 18 deletions

diff --git a/pandora/transport.py b/pandora/transport.py
index d942ae5..5fef39e 100644
--- a/pandora/transport.py
+++ b/pandora/transport.py
@@ -23,8 +23,6 @@ from .errors import PandoraException
 
 DEFAULT_API_HOST = "tuner.pandora.com/services/json/"
 
-logger = logging.getLogger(__name__)
-
 
 def retries(max_tries, exceptions=(Exception,)):
     """Function decorator implementing retrying logic.
@@ -234,13 +232,9 @@ class APITransport(object):
         self._start_request(method)
 
         url = self._build_url(method)
-        log_data = data
         data = self._build_data(method, data)
         params = self._build_params(method)
-        logger.info('TRANSPORT: \nMETHOD: {}\nPARAMS: {}\nDATA: {}\nURL: {}'
-                    .format(method, params, log_data, url))
         result = self._make_http_request(url, data, params)
-        logger.info('TRANSPORT: \nRESULT: {}\n'.format(result))
 
         return self._parse_response(result)
 
diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index 69fb632..58fca74 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -64,12 +64,12 @@ class TestCallingAPIClient(TestCase):
             client = APIClient(transport, None, None, None, None)
             client._authenticate = Mock()
 
-            client.get_playlist('mock_token')
+            client.get_playlist('token_mock')
 
             playlist_mock.assert_has_calls([call("station.getPlaylist",
                                              audioAdPodCapable=True,
                                              includeTrackLength=True,
-                                             stationToken='mock_token',
+                                             stationToken='token_mock',
                                              xplatformAdCapable=True)])
 
 
@@ -103,11 +103,11 @@ class TestGettingAds(TestCase):
             client = APIClient(transport, None, None, None, None)
             client._authenticate = Mock()
 
-            ad_item = client.get_ad_item('mock_id', 'mock_token')
-            assert ad_item.station_id == 'mock_id'
+            ad_item = client.get_ad_item('id_mock', 'token_mock')
+            assert ad_item.station_id == 'id_mock'
 
             ad_metadata_mock.assert_has_calls([call("ad.getAdMetadata",
-                                                      adToken='mock_token',
+                                                      adToken='token_mock',
                                                       returnAdTrackingTokens=True,
                                                       supportAudioAds=True)])
 
@@ -117,4 +117,4 @@ class TestGettingAds(TestCase):
         client = APIClient(transport, None, None, None, None)
         client.get_ad_metadata = Mock()
 
-        self.assertRaises(ParameterMissing, client.get_ad_item, '', 'mock_token')
+        self.assertRaises(ParameterMissing, client.get_ad_item, '', 'token_mock')
diff --git a/tests/test_pandora/test_transport.py b/tests/test_pandora/test_transport.py
index 59d4cea..6596a0e 100644
--- a/tests/test_pandora/test_transport.py
+++ b/tests/test_pandora/test_transport.py
@@ -18,7 +18,7 @@ class TestTransport(TestCase):
 
             time.sleep = Mock()
             client.transport._make_http_request = Mock(
-                    side_effect=SysCallError("mock_error"))
+                    side_effect=SysCallError("error_mock"))
             client.transport._start_request = Mock()
 
             client("method")
diff --git a/tests/test_pydora/test_utils.py b/tests/test_pydora/test_utils.py
index e5a81b5..ae6fa0b 100644
--- a/tests/test_pydora/test_utils.py
+++ b/tests/test_pydora/test_utils.py
@@ -18,8 +18,8 @@ class TestIterateForever(TestCase):
         with patch.object(APIClient, 'get_playlist') as get_playlist_mock:
             with patch.object(APIClient, 'register_ad', side_effect=ParameterMissing("ParameterMissing")):
 
-                station = Station.from_json(self.client, {'stationToken': 'mock_token'})
-                ad_mock = AdItem.from_json(self.client, {'station_id': 'mock_id'})
+                station = Station.from_json(self.client, {'stationToken': 'token_mock'})
+                ad_mock = AdItem.from_json(self.client, {'station_id': 'id_mock'})
                 get_playlist_mock.return_value=iter([ad_mock])
 
                 station_iter = iterate_forever(station.get_playlist)
@@ -31,9 +31,9 @@ class TestIterateForever(TestCase):
         with patch.object(APIClient, 'get_playlist', side_effect=ParameterMissing("ParameterMissing")) as get_playlist_mock:
                 with self.assertRaises(ParameterMissing):
 
-                    station = Station.from_json(self.client, {'stationToken': 'mock_token'})
-                    mock_track = PlaylistItem.from_json(self.client, {'token': 'mock_token'})
-                    get_playlist_mock.return_value=iter([mock_track])
+                    station = Station.from_json(self.client, {'stationToken': 'token_mock'})
+                    track_mock = PlaylistItem.from_json(self.client, {'token': 'token_mock'})
+                    get_playlist_mock.return_value=iter([track_mock])
 
                     station_iter = iterate_forever(station.get_playlist)
                     station_iter.next()