Merge lp:~mitya57/piston-mini-client/lp1105215 into lp:piston-mini-client

[Dmitry Shachnev]

This should fix bug 1105215 (socket.gaierror doesn't have "message" attribute, but has "strerror" instead).

[Barry Warsaw (barry)]

If we only care about Python 3.3, maybe it's better to catch OSError, since socket.error is a deprecated alias for OSError now, and socket.gaierror is a subclass of OSError. I guess it's not that big of a deal.

review: Approve

=== modified file 'piston_mini_client/__init__.py'
--- piston_mini_client/__init__.py	2013-02-21 20:29:42 +0000
+++ piston_mini_client/__init__.py	2013-02-26 17:06:06 +0000
@@ -426,8 +426,8 @@
         except socket.timeout as e:
             raise TimeoutError('Timed out attempting to connect to %s' %
                                (url,))
-        except (socket.gaierror, socket.error) as e:
-            msg = 'connecting to %s: %s' % (url, e.message)
+        except socket.error as e:
+            msg = 'connecting to %s: %s' % (url, e.strerror)
             raise SocketError(msg)
         if self._log_filename:
             self._dump_response(response, response_body)