[tor-commits] [pytorctl/master] Merge commit '40f7cbc' into bug2812

[mikeperry at torproject.org]

commit 3c6a3268326d928474b4a1093cf74a2c32898208
Merge: 42b5f0e 40f7cbc
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jun 16 19:15:38 2011 -0700

    Merge commit '40f7cbc' into bug2812
    
    Conflicts:
    	TorUtil.py

 TorCtl.py  |  186 ++++++++++++++++++++++++++++++------------------------------
 TorUtil.py |    9 ++-
 example.py |   34 +++++++++++
 3 files changed, 134 insertions(+), 95 deletions(-)

diff --cc TorUtil.py
index 82c2a12,fcbef70..b8d6425
--- a/TorUtil.py
+++ b/TorUtil.py
@@@ -200,7 -204,11 +200,8 @@@ class BufSock
          return result
  
      while 1:
-       s = self._s.recv(128)
 -      try:
 -        s = self._s.recv(128)
 -      except socket.timeout:
 -        if not self._isDone: continue
++      try: s = self._s.recv(128)
+       except: s = None
  
        if not s: return None
        # XXX: This really does need an exception
@@@ -222,7 -230,13 +223,11 @@@
      self._s.send(s)
  
    def close(self):
-     self._s.shutdown(socket.SHUT_RDWR)
 -    self._isDone = True
 -
+     # if we haven't yet established a connection then this raises an error
+     # socket.error: [Errno 107] Transport endpoint is not connected
+     try: self._s.shutdown(socket.SHUT_RDWR)
+     except socket.error: pass
+ 
      self._s.close()
  
  # SocketServer.TCPServer is nuts..