Cleanup pylint nitpicks

5 files changed, 24 insertions, 22 deletions

diff --git a/pandora/clientbuilder.py b/pandora/clientbuilder.py
index 1464d5c..6c29678 100644
--- a/pandora/clientbuilder.py
+++ b/pandora/clientbuilder.py
@@ -129,7 +129,6 @@ class SettingsDict(TranslatingDict):
     VALUE_TRANSLATIONS = {}
 
     def was_translated(self, from_key, to_key):
-        # TODO: Notify of deprecations
         pass
 
 
@@ -174,6 +173,9 @@ class FileBasedClientBuilder(APIClientBuilder):
     def path(self, path):
         self._path = os.path.expanduser(path)
 
+    def parse_config(self):
+        raise NotImplementedError
+
     def build(self):
         if not self.file_exists:
             raise IOError("File not found: {}".format(self.path))
@@ -204,8 +206,8 @@ class PydoraConfigFileBuilder(FileBasedClientBuilder):
     def parse_config(self):
         cfg = ConfigParser()
 
-        with open(self.path) as fp:
-            cfg.read_file(fp)
+        with open(self.path) as file:
+            cfg.read_file(file)
 
         settings = PydoraConfigFileBuilder.cfg_to_dict(cfg, "api")
         settings["user"] = PydoraConfigFileBuilder.cfg_to_dict(
@@ -242,8 +244,8 @@ class PianobarConfigFileBuilder(FileBasedClientBuilder):
     def parse_config(self):
         settings = PianobarSettingsDict()
 
-        with open(self.path, "r") as fp:
-            for line in fp.readlines():
+        with open(self.path, "r") as file:
+            for line in file.readlines():
                 line = line.strip()
 
                 if line and not line.startswith("#"):
diff --git a/pandora/errors.py b/pandora/errors.py
index 9fbd00e..d28a60f 100644
--- a/pandora/errors.py
+++ b/pandora/errors.py
@@ -82,7 +82,7 @@ class PandoraException(Exception):
         return "".join(output)
 
     @staticmethod
-    def _export_exceptions(export_to):
+    def export_exceptions(export_to):
         for code, api_message in __API_EXCEPTIONS__.items():
             name = PandoraException._format_name(api_message)
 
@@ -94,7 +94,7 @@ class PandoraException(Exception):
             export_to[name] = __API_EXCEPTIONS__[code] = exception
 
 
-PandoraException._export_exceptions(locals())
+PandoraException.export_exceptions(locals())
 
 
 class InvalidUserLogin(InvalidPartnerLogin):
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index 8fa8e21..0b138b3 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -1,5 +1,4 @@
 from .. import BaseAPIClient
-from . import with_metaclass, ModelMetaClass
 from . import Field, PandoraModel, PandoraListModel, PandoraDictListModel
 from ..errors import ParameterMissing
 
@@ -239,9 +238,9 @@ class AdItem(PlaylistModel):
     def prepare_playback(self):
         try:
             self.register_ad(self.station_id)
-        except ParameterMissing as e:
+        except ParameterMissing as exc:
             if self.tracking_tokens:
-                raise e
+                raise exc
         return super(AdItem, self).prepare_playback()
 
 
diff --git a/pandora/transport.py b/pandora/transport.py
index 58d4097..a8f885e 100644
--- a/pandora/transport.py
+++ b/pandora/transport.py
@@ -23,6 +23,9 @@ from .errors import PandoraException
 DEFAULT_API_HOST = "tuner.pandora.com/services/json/"
 
 
+# This decorator is a temporary workaround for handling SysCallErrors, see:
+# https://github.com/shazow/urllib3/issues/367. Should be removed once a fix is
+# applied in urllib3.
 def retries(max_tries, exceptions=(Exception,)):
     """Function decorator implementing retrying logic.
 
@@ -46,10 +49,10 @@ def retries(max_tries, exceptions=(Exception,)):
                     retries_left -= 1
                     return func(*args, **kwargs)
 
-                except exceptions as e:
+                except exceptions as exc:
                     # Don't retry for PandoraExceptions - unlikely that result
                     # will change for same set of input parameters.
-                    if isinstance(e, PandoraException):
+                    if isinstance(exc, PandoraException):
                         raise
                     if retries_left > 0:
                         time.sleep(delay_exponential(
@@ -179,9 +182,9 @@ class APITransport(object):
 
         params = self.remove_empty_values(params)
 
-        r = self._http.post(url, data=data, params=params)
-        r.raise_for_status()
-        return r.content
+        result = self._http.post(url, data=data, params=params)
+        result.raise_for_status()
+        return result.content
 
     def test_url(self, url):
         return self._http.head(url).status_code == requests.codes.OK
@@ -221,9 +224,6 @@ class APITransport(object):
         else:
             raise PandoraException.from_code(result["code"], result["message"])
 
-    # TODO: This decorator is a temporary workaround for handling
-    # SysCallErrors, see: https://github.com/shazow/urllib3/issues/367.
-    # Should be removed once a fix is applied in urllib3.
     @retries(3)
     def __call__(self, method, **data):
         self._start_request(method)
diff --git a/pandora/util.py b/pandora/util.py
index 3a1bc5f..5cbc774 100644
--- a/pandora/util.py
+++ b/pandora/util.py
@@ -25,10 +25,11 @@ def deprecated(in_version, remove_version, message):
     Decorator to warn that a function is deprecated and what version it will be
     removed in.
     """
-    def wrapper(f):
-        @wraps(f)
+    def wrapper(wrapped):
+        @wraps(wrapped)
         def inner_wrapper(self, *args, **kwargs):
-            warn_deprecated(in_version, remove_version, f.func_name, message)
-            return f(self, *args, **kwargs)
+            warn_deprecated(
+                in_version, remove_version, wrapped.func_name, message)
+            return wrapped(self, *args, **kwargs)
         return inner_wrapper
     return wrapper