From c7f1499d463650c835616379d19a51cecbdf1848 Mon Sep 17 00:00:00 2001 From: spl0k Date: Sat, 13 Apr 2019 16:02:32 +0200 Subject: [PATCH] Make Python2 happy --- supysonic/daemon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/supysonic/daemon.py b/supysonic/daemon.py index 8fa1848..bad8ea6 100644 --- a/supysonic/daemon.py +++ b/supysonic/daemon.py @@ -38,20 +38,20 @@ class DaemonClient(object): raise DaemonUnavailableError('No daemon address set') try: return Client(address = self.__address, authkey = self.__key) - except (FileNotFoundError, ConnectionRefusedError): + except IOError: raise DaemonUnavailableError("Couldn't connect to daemon at {}".format(self.__address)) def add_watched_folder(self, folder): if not isinstance(folder, strtype): raise TypeError('Expecting string, got ' + str(type(folder))) with self.__get_connection() as c: - c.send((WATCHER, W_ADD, folder)) + c.send((WATCHER, W_ADD, (folder,))) def remove_watched_folder(self, folder): if not isinstance(folder, strtype): raise TypeError('Expecting string, got ' + str(type(folder))) with self.__get_connection() as c: - c.send((WATCHER, W_DEL, folder)) + c.send((WATCHER, W_DEL, (folder,))) class Daemon(object): def __init__(self, address): @@ -61,7 +61,7 @@ class Daemon(object): def __handle_connection(self, connection): try: - module, cmd, *args = connection.recv() + module, cmd, args = connection.recv() if module == WATCHER: if cmd == W_ADD: self.__watcher.add_folder(*args)