4 files changed, 55 insertions, 28 deletions

diff --git a/pydora/audio_backend.py b/pydora/audio_backend.py
index bd778ad..aecd87e 100644
--- a/pydora/audio_backend.py
+++ b/pydora/audio_backend.py
@@ -15,18 +15,21 @@ log = logging.getLogger("pydora.audio_backend")
 class PlayerException(Exception):
     """Base class for all player exceptions
     """
+
     pass
 
 
 class UnsupportedEncoding(PlayerException):
     """Song encoding is not supported by player backend
     """
+
     pass
 
 
 class PlayerUnusable(PlayerException):
     """Player can not be used on this system
     """
+
     pass
 
 
@@ -172,7 +175,8 @@ class BasePlayer:
                 self._loop_hook()
 
                 readers, _, _ = select.select(
-                    self._get_select_readers(), [], [], 1)
+                    self._get_select_readers(), [], [], 1
+                )
 
                 for handle in readers:
                     if handle.fileno() == self._control_fd:
@@ -296,7 +300,6 @@ class VLCPlayer(BasePlayer):
 
 
 class RemoteVLC(VLCPlayer):
-
     def __init__(self, host, port, callbacks, control_channel):
         self._connect_to = (host, int(port))
         self._control_sock = None
diff --git a/pydora/configure.py b/pydora/configure.py
index d31c097..d58d445 100644
--- a/pydora/configure.py
+++ b/pydora/configure.py
@@ -32,11 +32,13 @@ class PandoraKeysConfigParser:
     the pandora API docs keys source file.
     """
 
-    KEYS_URL = ("http://6xq.net/git/lars/pandora-apidoc.git/"
-                "plain/json/partners.rst")
+    KEYS_URL = (
+        "http://6xq.net/git/lars/pandora-apidoc.git/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()
@@ -90,7 +92,7 @@ class PandoraKeysConfigParser:
                 key = self._clean_device_name(buffer.pop())
                 current_partner = partners[key] = {
                     "api_host": self._format_api_host(api_host)
-                    }
+                }
 
             buffer.append(line.strip().lower())
 
@@ -165,8 +167,9 @@ class Configurator:
         self.add_partner_config(self.get_partner_config())
         self.get_value("user", "username", "Pandora Username: ")
         self.get_password("user", "password", "Pandora Password: ")
-        self.set_static_value("api", "default_audio_quality",
-                              APIClient.HIGH_AUDIO_QUALITY)
+        self.set_static_value(
+            "api", "default_audio_quality", APIClient.HIGH_AUDIO_QUALITY
+        )
 
         self.write_config()
 
diff --git a/pydora/player.py b/pydora/player.py
index fdacc63..c4ce2e0 100644
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -132,8 +132,12 @@ class PlayerApp:
         if song.is_ad:
             print("{} ".format(Colors.cyan("Advertisement")))
         else:
-            print("{} by {}".format(Colors.cyan(song.song_name),
-                                    Colors.yellow(song.artist_name)))
+            print(
+                "{} by {}".format(
+                    Colors.cyan(song.song_name),
+                    Colors.yellow(song.artist_name),
+                )
+            )
 
     def skip_song(self, song):
         if song.is_ad:
@@ -183,13 +187,15 @@ class PlayerApp:
                 self.screen.print_error("Failed to bookmark artis")
         except NotImplementedError:
             self.screen.print_error(
-                "Cannot bookmark artist for this type of track")
+                "Cannot bookmark artist for this type of track"
+            )
 
     def sleep_song(self, song):
         try:
             if song.sleep():
                 self.screen.print_success(
-                    "Song will not be played for 30 days")
+                    "Song will not be played for 30 days"
+                )
                 self.player.stop()
             else:
                 self.screen.print_error("Failed to sleep song")
@@ -214,10 +220,14 @@ class PlayerApp:
 
     def help(self, song):
         print("")
-        print("\n".join([
-            "\t{:>2} - {}".format(k, v[0])
-            for k, v in sorted(self.CMD_MAP.items())
-        ]))
+        print(
+            "\n".join(
+                [
+                    "\t{:>2} - {}".format(k, v[0])
+                    for k, v in sorted(self.CMD_MAP.items())
+                ]
+            )
+        )
         print("")
 
     def input(self, input, song):
@@ -227,7 +237,8 @@ class PlayerApp:
             cmd = getattr(self, self.CMD_MAP[input][1])
         except (IndexError, KeyError):
             return self.screen.print_error(
-                "Invalid command {!r}!".format(input))
+                "Invalid command {!r}!".format(input)
+            )
 
         cmd(song)
 
@@ -240,21 +251,30 @@ class PlayerApp:
     def pre_flight_checks(self):
         # See #52, this key no longer passes some server-side check
         if self.client.partner_user == "iphone":
-            self.screen.print_error((
-                "The `iphone` partner key set is no longer compatible with "
-                "pydora. Please re-run pydora-configure to re-generate "
-                "your config file before continuing."))
+            self.screen.print_error(
+                (
+                    "The `iphone` partner key set is no longer compatible "
+                    "with pydora. Please re-run pydora-configure to "
+                    "re-generate your config file before continuing."
+                )
+            )
             sys.exit(1)
 
     def _parse_args(self):
         parser = argparse.ArgumentParser(
-            description="command line Pandora player")
+            description="command line Pandora player"
+        )
         parser.add_argument(
-            "--vlc-net", dest="vlc_net",
-            help="connect to VLC over the network (host:port)")
+            "--vlc-net",
+            dest="vlc_net",
+            help="connect to VLC over the network (host:port)",
+        )
         parser.add_argument(
-            "-v", dest="verbose", action="store_true",
-            help="enable verbose logging")
+            "-v",
+            dest="verbose",
+            action="store_true",
+            help="enable verbose logging",
+        )
         return parser.parse_args()
 
     def run(self):
diff --git a/pydora/utils.py b/pydora/utils.py
index 6675773..5a96ff1 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -10,11 +10,11 @@ class TerminalPlatformUnsupported(Exception):
     Raised by code that can not be used to interact with the terminal on this
     platform.
     """
+
     pass
 
 
 class Colors:
-
     def __wrap_with(raw_code):
         @staticmethod
         def inner(text, bold=False):
@@ -22,6 +22,7 @@ class Colors:
             if bold:
                 code = "1;{}".format(code)
             return "\033[{}m{}\033[0m".format(code, text)
+
         return inner
 
     red = __wrap_with("31")
@@ -44,6 +45,7 @@ class PosixEchoControl:
     def __init__(self):
         try:
             import termios
+
             self.termios = termios
         except ImportError:
             raise TerminalPlatformUnsupported("POSIX not supported")
@@ -110,7 +112,6 @@ class Win32EchoControl:
 
 
 class Screen:
-
     def __init__(self):
         try:
             self._echo_driver = PosixEchoControl()