Cleanup pylint nitpicks

9 files changed, 50 insertions, 52 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
diff --git a/pydora/configure.py b/pydora/configure.py
index 21ea3c3..824ab03 100644
--- a/pydora/configure.py
+++ b/pydora/configure.py
@@ -10,7 +10,7 @@ from pandora.clientbuilder import PydoraConfigFileBuilder
 from .utils import Screen, Colors
 
 
-class umask(object):
+class Umask(object):
     """Set/Restore Umask Context Manager
     """
 
@@ -36,7 +36,7 @@ class PandoraKeysConfigParser(object):
                 "plain/json/partners.rst")
 
     FIELD_RE = re.compile(
-            ":(?P<key>[^:]+): (?:`{2})?(?P<value>[^`\n]+)(?:`{2})?$")
+        ":(?P<key>[^:]+): (?:`{2})?(?P<value>[^`\n]+)(?:`{2})?$")
 
     def _fixup_key(self, key):
         key = key.lower()
@@ -89,8 +89,8 @@ class PandoraKeysConfigParser(object):
             elif self._is_device_terminator(line):
                 key = self._clean_device_name(buffer.pop())
                 current_partner = partners[key] = {
-                        "api_host": self._format_api_host(api_host)
-                        }
+                    "api_host": self._format_api_host(api_host)
+                    }
 
             buffer.append(line.strip().lower())
 
@@ -142,8 +142,8 @@ class Configurator(object):
             self.cfg.set("api", key, value)
 
     def write_config(self):
-        with umask(0o077), open(self.builder.path, "w") as fp:
-            self.cfg.write(fp)
+        with Umask(0o077), open(self.builder.path, "w") as file:
+            self.cfg.write(file)
 
     def configure(self):
         if self.builder.file_exists:
diff --git a/pydora/mpg123.py b/pydora/mpg123.py
index e60ab43..796a8ab 100644
--- a/pydora/mpg123.py
+++ b/pydora/mpg123.py
@@ -70,10 +70,10 @@ class Player(object):
                 readers, _, _ = select.select(
                     [self._control_channel, self._process.stdout], [], [], 1)
 
-                for fd in readers:
-                    value = fd.readline().strip()
+                for handle in readers:
+                    value = handle.readline().strip()
 
-                    if fd.fileno() == self._control_fd:
+                    if handle.fileno() == self._control_fd:
                         self._callbacks.input(value, song)
                     else:
                         if self._player_stopped(value):
diff --git a/pydora/player.py b/pydora/player.py
index 4561442..6e93df5 100755
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -10,7 +10,7 @@ from __future__ import print_function
 
 import os
 import sys
-from pandora import APIClient, clientbuilder
+from pandora import clientbuilder
 
 from .mpg123 import Player
 from .utils import Colors, Screen
@@ -82,9 +82,9 @@ class PlayerApp(object):
         """
         Screen.clear()
 
-        for i, s in enumerate(self.stations):
+        for i, station in enumerate(self.stations):
             i = "{:>3}".format(i)
-            print("{}: {}".format(Colors.yellow(i), s.name))
+            print("{}: {}".format(Colors.yellow(i), station.name))
 
         return self.stations[Screen.get_integer("Station: ")]
 
@@ -95,7 +95,7 @@ class PlayerApp(object):
             print("{} ".format(Colors.cyan("Advertisement")))
         else:
             print("{} by {}".format(Colors.cyan(song.song_name),
-                  Colors.yellow(song.artist_name)))
+                                    Colors.yellow(song.artist_name)))
 
     def skip_song(self, song):
         if song.is_ad:
diff --git a/pydora/utils.py b/pydora/utils.py
index 275c386..3c3aa39 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -5,8 +5,6 @@ import sys
 import termios
 import getpass
 import subprocess
-from pandora.models.pandora import AdItem
-from pandora import errors
 
 
 def input(prompt):
@@ -19,13 +17,13 @@ def input(prompt):
 
 class Colors(object):
 
-    def __wrap_with(code):
+    def __wrap_with(raw_code):
         @staticmethod
         def inner(text, bold=False):
-            c = code
+            code = raw_code
             if bold:
-                c = "1;{}".format(c)
-            return "\033[{}m{}\033[0m".format(c, text)
+                code = "1;{}".format(code)
+            return "\033[{}m{}\033[0m".format(code, text)
         return inner
 
     red = __wrap_with("31")
@@ -41,20 +39,18 @@ class Screen(object):
 
     @staticmethod
     def set_echo(enabled):
-        fd = sys.stdin.fileno()
-        if not os.isatty(fd):
+        handle = sys.stdin.fileno()
+        if not os.isatty(handle):
             return
 
-        (iflag, oflag, cflag,
-         lflag, ispeed, ospeed, cc) = termios.tcgetattr(fd)
+        attrs = termios.tcgetattr(handle)
 
         if enabled:
-            lflag |= termios.ECHO
+            attrs[3] |= termios.ECHO
         else:
-            lflag &= ~termios.ECHO
+            attrs[3] &= ~termios.ECHO
 
-        termios.tcsetattr(fd, termios.TCSANOW,
-                          [iflag, oflag, cflag, lflag, ispeed, ospeed, cc])
+        termios.tcsetattr(handle, termios.TCSANOW, attrs)
 
     @staticmethod
     def clear():
@@ -120,9 +116,9 @@ def iterate_forever(func, *args, **kwargs):
 
     while True:
         try:
-            playlistItem = next(output)
-            playlistItem.prepare_playback()
-            yield playlistItem
+            playlist_item = next(output)
+            playlist_item.prepare_playback()
+            yield playlist_item
         except StopIteration:
             output = func(*args, **kwargs)