Consistent quoting

3 files changed, 41 insertions, 41 deletions

diff --git a/pydora/mpg123.py b/pydora/mpg123.py
index 4f507ab..2c5e4d3 100644
--- a/pydora/mpg123.py
+++ b/pydora/mpg123.py
@@ -23,10 +23,10 @@ class SilentPopen(subprocess.Popen):
     """
 
     def __init__(self, *args, **kwargs):
-        self._dev_null = open(os.devnull, 'w')
-        kwargs['stdin'] = subprocess.PIPE
-        kwargs['stdout'] = subprocess.PIPE
-        kwargs['stderr'] = self._dev_null
+        self._dev_null = open(os.devnull, "w")
+        kwargs["stdin"] = subprocess.PIPE
+        kwargs["stdout"] = subprocess.PIPE
+        kwargs["stderr"] = self._dev_null
         super(SilentPopen, self).__init__(*args, **kwargs)
 
     def __del__(self):
@@ -81,10 +81,10 @@ class Player(object):
             return
 
         self._process = SilentPopen(
-            ['mpg123', '-q', '-R', '--ignore-mime'])
+            ["mpg123", "-q", "-R", "--ignore-mime"])
 
         # Only output play status in the player stdout
-        self._send_cmd('silence')
+        self._send_cmd("silence")
 
     def _send_cmd(self, cmd):
         """Write command to remote mpg123 process
@@ -95,17 +95,17 @@ class Player(object):
     def stop(self):
         """Stop the currently playing song
         """
-        self._send_cmd('stop')
+        self._send_cmd("stop")
 
     def pause(self):
         """Pause the player
         """
-        self._send_cmd('pause')
+        self._send_cmd("pause")
 
     def _player_stopped(self, value):
         """Determine if player has stopped
         """
-        return value.startswith(b"@P") and value.decode('utf-8')[3] == "0"
+        return value.startswith(b"@P") and value.decode("utf-8")[3] == "0"
 
     def play(self, song):
         """Play a new song from a Pandora model
@@ -114,7 +114,7 @@ class Player(object):
         process. Calls the input callback when the user has input.
         """
         self._callbacks.play(song)
-        self._send_cmd('load {}'.format(song.audio_url))
+        self._send_cmd("load {}".format(song.audio_url))
 
         while True:
             try:
diff --git a/pydora/player.py b/pydora/player.py
index b756ef0..9b99c8c 100755
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -19,16 +19,16 @@ from .utils import Colors, Screen
 class PlayerApp(object):
 
     CMD_MAP = {
-        'n': ('play next song', 'skip_song'),
-        'p': ('pause/resume song', 'pause_song'),
-        's': ('stop playing station', 'stop_station'),
-        'd': ('dislike song', 'dislike_song'),
-        'u': ('like song', 'like_song'),
-        'b': ('bookmark song', 'bookmark_song'),
-        'a': ('bookmark artist', 'bookmark_artist'),
-        'S': ('sleep song for 30 days', 'sleep_song'),
-        'Q': ('quit player', 'quit'),
-        '?': ('display this help', 'help'),
+        "n": ("play next song", "skip_song"),
+        "p": ("pause/resume song", "pause_song"),
+        "s": ("stop playing station", "stop_station"),
+        "d": ("dislike song", "dislike_song"),
+        "u": ("like song", "like_song"),
+        "b": ("bookmark song", "bookmark_song"),
+        "a": ("bookmark artist", "bookmark_artist"),
+        "S": ("sleep song for 30 days", "sleep_song"),
+        "Q": ("quit player", "quit"),
+        "?": ("display this help", "help"),
     }
 
     def __init__(self):
@@ -55,15 +55,15 @@ class PlayerApp(object):
         Screen.clear()
 
         for i, s in enumerate(self.stations):
-            i = '{:>3}'.format(i)
-            print('{}: {}'.format(Colors.yellow(i), s.name))
+            i = "{:>3}".format(i)
+            print("{}: {}".format(Colors.yellow(i), s.name))
 
-        return self.stations[Screen.get_integer('Station: ')]
+        return self.stations[Screen.get_integer("Station: ")]
 
     def play(self, song):
         """Play callback
         """
-        print('{} by {}'.format(Colors.cyan(song.song_name),
+        print("{} by {}".format(Colors.cyan(song.song_name),
               Colors.yellow(song.artist_name)))
 
     def skip_song(self, song):
@@ -77,24 +77,24 @@ class PlayerApp(object):
 
     def dislike_song(self, song):
         song.thumbs_down()
-        Screen.print_success('Track disliked')
+        Screen.print_success("Track disliked")
         self.player.stop()
 
     def like_song(self, song):
         song.thumbs_up()
-        Screen.print_success('Track liked')
+        Screen.print_success("Track liked")
 
     def bookmark_song(self, song):
         song.bookmark_song()
-        Screen.print_success('Bookmarked song')
+        Screen.print_success("Bookmarked song")
 
     def bookmark_artist(self, song):
         song.bookmark_artist()
-        Screen.print_success('Bookmarked artist')
+        Screen.print_success("Bookmarked artist")
 
     def sleep_song(self, song):
         song.sleep()
-        Screen.print_success('Song will not be played for 30 days')
+        Screen.print_success("Song will not be played for 30 days")
         self.player.stop()
 
     def quit(self, song):
@@ -114,7 +114,7 @@ class PlayerApp(object):
         try:
             cmd = getattr(self, self.CMD_MAP[input][1])
         except (IndexError, KeyError):
-            return Screen.print_error('Invalid command!')
+            return Screen.print_error("Invalid command!")
 
         cmd(song)
 
@@ -140,5 +140,5 @@ def main():
     PlayerApp().run()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/pydora/utils.py b/pydora/utils.py
index bf5f4ce..76d12f3 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -23,13 +23,13 @@ class Colors(object):
             return "\033[{}m{}\033[0m".format(c, text)
         return inner
 
-    red = __wrap_with('31')
-    green = __wrap_with('32')
-    yellow = __wrap_with('33')
-    blue = __wrap_with('34')
-    magenta = __wrap_with('35')
-    cyan = __wrap_with('36')
-    white = __wrap_with('37')
+    red = __wrap_with("31")
+    green = __wrap_with("32")
+    yellow = __wrap_with("33")
+    blue = __wrap_with("34")
+    magenta = __wrap_with("35")
+    cyan = __wrap_with("36")
+    white = __wrap_with("37")
 
 
 class Screen(object):
@@ -50,7 +50,7 @@ class Screen(object):
 
     @staticmethod
     def clear():
-        sys.stdout.write('\x1b[2J\x1b[H')
+        sys.stdout.write("\x1b[2J\x1b[H")
         sys.stdout.flush()
 
     @staticmethod
@@ -72,11 +72,11 @@ class Screen(object):
             try:
                 return int(input(prompt).strip())
             except ValueError:
-                print(Colors.red('Invaid Input!'))
+                print(Colors.red("Invaid Input!"))
 
 
 def clear_screen():
     """Clear the terminal
     """
-    sys.stdout.write('\x1b[2J\x1b[H')
+    sys.stdout.write("\x1b[2J\x1b[H")
     sys.stdout.flush()