Upgrade Python syntax with pyupgrade --py3-plus

4 files changed, 21 insertions, 21 deletions

diff --git a/pydora/audio_backend.py b/pydora/audio_backend.py
index d39bb9b..bd778ad 100644
--- a/pydora/audio_backend.py
+++ b/pydora/audio_backend.py
@@ -30,7 +30,7 @@ class PlayerUnusable(PlayerException):
     pass
 
 
-class BasePlayer(object):
+class BasePlayer:
     """Audio Backend Process Manager
 
     Starts and owns a handle to an audio backend process then feeds commands to
@@ -208,7 +208,7 @@ class MPG123Player(BasePlayer):
     """
 
     def __init__(self, callbacks, control_channel):
-        super(MPG123Player, self).__init__(callbacks, control_channel)
+        super().__init__(callbacks, control_channel)
         self._cmd.extend(["-q", "-R", "--ignore-mime", "."])
 
     def _find_path(self):
@@ -246,7 +246,7 @@ class VLCPlayer(BasePlayer):
     VOL_STEPS = 5
 
     def __init__(self, callbacks, control_channel):
-        super(VLCPlayer, self).__init__(callbacks, control_channel)
+        super().__init__(callbacks, control_channel)
         self._cmd.extend(["-I", "rc", "--advanced", "--rc-fake-tty", "-q"])
         self._last_poll = 0
 
@@ -300,7 +300,7 @@ class RemoteVLC(VLCPlayer):
     def __init__(self, host, port, callbacks, control_channel):
         self._connect_to = (host, int(port))
         self._control_sock = None
-        super(RemoteVLC, self).__init__(callbacks, control_channel)
+        super().__init__(callbacks, control_channel)
 
     def _get_select_readers(self):
         return [self._control_channel, self._control_sock]
diff --git a/pydora/configure.py b/pydora/configure.py
index 7c051df..d31c097 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:
     """Set/Restore Umask Context Manager
     """
 
@@ -25,7 +25,7 @@ class Umask(object):
         os.umask(self.old_umask)
 
 
-class PandoraKeysConfigParser(object):
+class PandoraKeysConfigParser:
     """Parser for Pandora Keys Source Page
 
     This is an extremely naive restructured text parser designed only to parse
@@ -97,7 +97,7 @@ class PandoraKeysConfigParser(object):
         return partners
 
 
-class Configurator(object):
+class Configurator:
     """Interactive Configuration Builder
 
     Allows a user to configure pydora interactively. Ultimately writes the
diff --git a/pydora/player.py b/pydora/player.py
index 74b6110..fdacc63 100644
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -18,7 +18,7 @@ from .audio_backend import MPG123Player, VLCPlayer
 from .audio_backend import UnsupportedEncoding, PlayerUnusable
 
 
-class PlayerCallbacks(object):
+class PlayerCallbacks:
     """Interface for Player Callbacks
 
     This class simply exists to document the interface for callback
@@ -46,7 +46,7 @@ class PlayerCallbacks(object):
         pass
 
 
-class PlayerApp(object):
+class PlayerApp:
 
     CMD_MAP = {
         "n": ("play next song", "skip_song"),
@@ -122,7 +122,7 @@ class PlayerApp(object):
 
         for i, station in enumerate(self.stations):
             i = "{:>3}".format(i)
-            print(u"{}: {}".format(Colors.yellow(i), station.name))
+            print("{}: {}".format(Colors.yellow(i), station.name))
 
         return self.stations[self.screen.get_integer("Station: ")]
 
@@ -130,10 +130,10 @@ class PlayerApp(object):
         """Play callback
         """
         if song.is_ad:
-            print(u"{} ".format(Colors.cyan("Advertisement")))
+            print("{} ".format(Colors.cyan("Advertisement")))
         else:
-            print(u"{} 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:
diff --git a/pydora/utils.py b/pydora/utils.py
index ca40095..6675773 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -13,15 +13,15 @@ class TerminalPlatformUnsupported(Exception):
     pass
 
 
-class Colors(object):
+class Colors:
 
     def __wrap_with(raw_code):
         @staticmethod
         def inner(text, bold=False):
             code = raw_code
             if bold:
-                code = u"1;{}".format(code)
-            return u"\033[{}m{}\033[0m".format(code, text)
+                code = "1;{}".format(code)
+            return "\033[{}m{}\033[0m".format(code, text)
         return inner
 
     red = __wrap_with("31")
@@ -33,7 +33,7 @@ class Colors(object):
     white = __wrap_with("37")
 
 
-class PosixEchoControl(object):
+class PosixEchoControl:
     """Posix Console Echo Control Driver
 
     Uses termios on POSIX compliant platforms to control console echo. Is not
@@ -63,7 +63,7 @@ class PosixEchoControl(object):
         self.termios.tcsetattr(handle, self.termios.TCSANOW, attrs)
 
 
-class Win32EchoControl(object):
+class Win32EchoControl:
     """Windows Console Echo Control Driver
 
     This uses the console API from WinCon.h and ctypes to control console echo
@@ -109,7 +109,7 @@ class Win32EchoControl(object):
             self._SetConsoleMode(stdin, mode & self.DISABLE_ECHO_INPUT)
 
 
-class Screen(object):
+class Screen:
 
     def __init__(self):
         try:
@@ -201,8 +201,8 @@ class SilentPopen(subprocess.Popen):
         kwargs["stdin"] = subprocess.PIPE
         kwargs["stdout"] = subprocess.PIPE
         kwargs["stderr"] = self._dev_null
-        super(SilentPopen, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def __del__(self):
         self._dev_null.close()
-        super(SilentPopen, self).__del__()
+        super().__del__()