[or-cvs] Try shotgun approach, and propagate *all* exceptions.

Nick Mathewson nickm at seul.org
Thu Nov 17 17:12:10 UTC 2005


Update of /home/or/cvsroot/control/python
In directory moria:/tmp/cvs-serv26249/python

Modified Files:
	TorCtl1.py 
Log Message:
Try shotgun approach, and propagate *all* exceptions.

Index: TorCtl1.py
===================================================================
RCS file: /home/or/cvsroot/control/python/TorCtl1.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- TorCtl1.py	17 Nov 2005 04:45:18 -0000	1.13
+++ TorCtl1.py	17 Nov 2005 17:12:08 -0000	1.14
@@ -161,7 +161,8 @@
             ex = None
             try:
                 lines = _read_reply(self._s,self._debugFile)
-            except (OSError, socket.error), err:
+            except:
+                _, err, _ = sys.exc_info()
                 if self._queue.get(timeout=0) == "CLOSE":
                     ex = TorCtl.TorCtlClosed()
                 else:



More information about the tor-commits mailing list