mpd.py: adding a workaround for systems missing socket.AI_ADDRCONFIG

[python-musicpd.git] / mpd.py

diff --git a/mpd.py b/mpd.py
index 8b70f4aa955ffcfcf2bda81f85c642879238e76b..384f856f522d44214c444179c2f5ba586d48e4f2 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -291,9 +291,13 @@ class MPDClient(object):
         if self._sock:
             raise ConnectionError("Already connected")
         msg = "getaddrinfo returns an empty list"
+        try:
+            flags = socket.AI_ADDRCONFIG
+        except AttributeError:
+            flags = 0
         for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
                                       socket.SOCK_STREAM, socket.IPPROTO_TCP,
-                                      socket.AI_ADDRCONFIG):
+                                      flags):
             af, socktype, proto, canonname, sa = res
             try:
                 self._sock = socket.socket(af, socktype, proto)
@@ -310,7 +314,7 @@ class MPDClient(object):
         self._wfile = self._sock.makefile("wb")
         try:
             self._hello()
-        except (socket.error, MPDError):
+        except:
             self.disconnect()
             raise