diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-01 05:07:46 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-01 05:07:46 +0000 |
| commit | cd006f969edd7e04f70b12f50b4a0cb844e022ae (patch) | |
| tree | 04bc33cab361d8a8d4f766fe691409edd3fdae81 /rpkid/rpki/async.py | |
| parent | fd6c0d51c75ccb24b50a4247ac34ab24f62f8636 (diff) | |
New TLS code mostly working. Only lightly tested so far, but "make
test" ran to completion.
svn path=/pow/POW-0.7/POW.c; revision=2481
Diffstat (limited to 'rpkid/rpki/async.py')
| -rw-r--r-- | rpkid/rpki/async.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/rpki/async.py b/rpkid/rpki/async.py index 1c295f76..53c9e4b2 100644 --- a/rpkid/rpki/async.py +++ b/rpkid/rpki/async.py @@ -49,7 +49,7 @@ class iterator(object): #rpki.log.debug("Created iterator id %s file %s line %s function %s" % (id(self), self.caller_file, self.caller_line, self.caller_function)) try: self.iterator = iter(iterable) - except ExitNow: + except (ExitNow, SystemExit): raise except: rpki.log.debug("Problem constructing iterator for %s" % repr(iterable)) @@ -172,7 +172,7 @@ class timer(object): t = cls.queue.pop(0) try: t.handler() - except ExitNow: + except (ExitNow, SystemExit): raise except Exception, e: t.errback(e) |