Updated docstring. Made socket exceptions more specific. Updated docs

Author: Dan

pssh.py

@@ -17,7 +17,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-"""Small wrapper library over paramiko that allows for parallel execution of SSH commands on remote hosts and executing simple single host commands over SSH.
+"""Asynchronous parallel SSH library
 
 parallel-ssh uses asychronous network requests - there is *no* multi-threading or multi-processing used.
 
@@ -28,13 +28,13 @@
 See :mod:`pssh.ParallelSSHClient` and :mod:`pssh.SSHClient` for class documentation.
 """
 
-import gevent.pool
-from gevent import socket
-from gevent import monkey
-monkey.patch_all()
+from socket import gaierror as sock_gaierror, error as sock_error
 import logging
 import paramiko
 import os
+import gevent.pool
+from gevent import monkey
+monkey.patch_all()
 
 host_logger = logging.getLogger('host_logging')
 handler = logging.StreamHandler()
@@ -158,7 +158,7 @@ def _connect(self, retries=1):
                                 password=self.password, port=self.port,
                                 pkey=self.pkey,
                                 sock=self.proxy_command, timeout=self.timeout)
-        except socket.gaierror, e:
+        except sock_gaierror, e:
             logger.error("Could not resolve host '%s' - retry %s/%s",
                          self.host, retries, self.num_retries)
             while retries < self.num_retries:
@@ -167,7 +167,7 @@ def _connect(self, retries=1):
             raise UnknownHostException("%s - %s - retry %s/%s",
                                        str(e.args[1]),
                                        self.host, retries, self.num_retries)
-        except socket.error, e:
+        except sock_error, e:
             logger.error("Error connecting to host '%s:%s' - retry %s/%s",
                          self.host, self.port, retries, self.num_retries)
             while retries < self.num_retries:

tests/test_pssh_client.py

@@ -124,7 +124,7 @@ def test_pssh_client_timeout(self):
             gevent.sleep(0.5)
             cmd.get()
             if not server.exception:
-                raise Exception("Expected EOFError from socket timeout, got none")
+                raise Exception("Expected gevent.Timeout from socket timeout, got none")
             raise server.exception
         except gevent.Timeout:
             pass