[or-cvs] aaand another.

[nickm@xxxxxxxx (Nick Mathewson)]

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

Modified Files:
	TorCtl1.py 
Log Message:
aaand another.

Index: TorCtl1.py
===================================================================
RCS file: /home/or/cvsroot/control/python/TorCtl1.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TorCtl1.py	17 Nov 2005 17:12:08 -0000	1.14
+++ TorCtl1.py	17 Nov 2005 17:19:36 -0000	1.15
@@ -163,7 +163,11 @@
                 lines = _read_reply(self._s,self._debugFile)
             except:
                 _, err, _ = sys.exc_info()
-                if self._queue.get(timeout=0) == "CLOSE":
+                try:
+                    cb = self._queue.get(timeout=0)
+                except Queue.Empty:
+                    cb = None
+                if cb == "CLOSED":
                     ex = TorCtl.TorCtlClosed()
                 else:
                     ex = err