X-Git-Url: https://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=musicpd.py;h=eeb4b9a81c4a04d7b856fa5e679356ddfee78af6;hp=d8dc01b9048510a5b93ae00f652c5471e2674259;hb=HEAD;hpb=d6d480d5611d5a412555d6887dbac983880123c3 diff --git a/musicpd.py b/musicpd.py index d8dc01b..e24b51d 100644 --- a/musicpd.py +++ b/musicpd.py @@ -19,7 +19,7 @@ ERROR_PREFIX = "ACK " SUCCESS = "OK" NEXT = "list_OK" #: Module version -VERSION = '0.9.0b2' +VERSION = '0.9.0' #: Seconds before a connection attempt times out #: (overriden by :envvar:`MPD_TIMEOUT` env. var.) CONNECTION_TIMEOUT = 30 @@ -164,12 +164,12 @@ class MPDClient: :py:attr:`musicpd.MPDClient.port` keep track of current connection host and port, :py:attr:`musicpd.MPDClient.pwd` is set once with password extracted from environment variable. - Calling :py:meth:`password` methode with a new password + Calling MPS's password method with a new password won't update :py:attr:`musicpd.MPDClient.pwd` value. Moreover, :py:attr:`musicpd.MPDClient.pwd` is only an helper attribute exposing password extracted from :envvar:`MPD_HOST` environment variable, it - will not be used as default value for the :py:meth:`password` method + will not be used as default value for the MPD's password command. """ def __init__(self): @@ -349,7 +349,7 @@ class MPDClient: else: # MPD_HOST is a plain host self.host = _host - log.debug('host detected in MPD_HOST: @%s', self.host) + log.debug('host detected in MPD_HOST: %s', self.host) else: # Is socket there xdg_runtime_dir = os.getenv('XDG_RUNTIME_DIR', '/run') @@ -648,7 +648,7 @@ class MPDClient: sock.connect(path) sock.settimeout(self.socket_timeout) except socket.error as socket_err: - raise ConnectionError(socket_err.strerror) from socket_err + raise ConnectionError(socket_err) from socket_err return sock def _connect_tcp(self, host, port): @@ -662,7 +662,7 @@ class MPDClient: socket.SOCK_STREAM, socket.IPPROTO_TCP, flags) except socket.error as gaierr: - raise ConnectionError(gaierr.strerror) from gaierr + raise ConnectionError(gaierr) from gaierr for res in gai: af, socktype, proto, _, sa = res sock = None @@ -674,12 +674,12 @@ class MPDClient: sock.settimeout(self.socket_timeout) return sock except socket.error as socket_err: - log.debug('opening socket %s failed: %s}', sa, socket_err) + log.debug('opening socket %s failed: %s', sa, socket_err) err = socket_err if sock is not None: sock.close() if err is not None: - raise ConnectionError(err.strerror) + raise ConnectionError(err) raise ConnectionError("getaddrinfo returns an empty list") def noidle(self): @@ -738,8 +738,8 @@ class MPDClient: """Socket timeout in second (defaults to :py:obj:`SOCKET_TIMEOUT`). Use :py:obj:`None` to disable socket timout. - :setter: Set the socket timeout - :type: int or None (integer > 0) + :setter: Set the socket timeout (integer > 0) + :type: int or None """ return self._socket_timeout