Revert "more readable exception handling _connect_tcp()"

multani · multani · commit c1369ca12b1b · 2012-03-20T13:18:39.000+07:00
This reverts commit da8cb1a. It turned out that da8cb1 actually changed the API of python-mpd: if an error occurred while connecting to the MPD server, MPDClient._connect_tcp() would always return 'ConnectionError("getaddrinfo returns an empty list"), even if getaddrinfo() actually returned something. I have no idea how to make getaddrinfo() returns nothing, so it's hard to test at the moment. Conflicts: test.py
diff --git a/mpd.py b/mpd.py
@@ -395,11 +395,11 @@ def _connect_tcp(self, host, port):
                 err = e
                 if sock is not None:
                     sock.close()
+        if err is not None:
+            raise err
         else:
             raise ConnectionError("getaddrinfo returns an empty list")
 
-        raise err
-
     def connect(self, host, port):
         if self._sock is not None:
             raise ConnectionError("Already connected")
diff --git a/test.py b/test.py
@@ -33,7 +33,7 @@ def setUpClass(self):
             self.client.connect(MPD_HOST, MPD_PORT)
             self.idleclient.connect(MPD_HOST, MPD_PORT)
             self.commands = self.client.commands()
-        except (mpd.ConnectionError, SocketError) as e:
+        except SocketError as e:
             raise Exception("Can't connect mpd! Start it or check the configuration: %s" % e)
         if MPD_PASSW != None:
             try:
@@ -129,12 +129,6 @@ def test_client_to_client(self):
         channels = self.client.channels()
         self.assertNotIn("monty", channels)
 
-    def test_connection_error(self):
-        client2 = mpd.MPDClient()
-        with self.assertRaises(mpd.ConnectionError) as cm:
-            # should never return getaddrinfo
-            client2.connect("255.255.255.255", 6600)
-
     def test_commands_list(self):
         """
         Test if all implemented commands are valid
