From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 31 Oct 2005 14:27:01 +0000 (+0000)
Subject: Exception handling now raises KeyboardInterrupt and SystemExit rather than passing... 
X-Git-Tag: v2.5a0~1205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245a5ab31bbaa48776736bdd101b0df7164125c9;p=thirdparty%2FPython%2Fcpython.git

Exception handling now raises KeyboardInterrupt and SystemExit rather than passing to handleError
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index e0ab788f3237..0ffbc4744aab 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -725,6 +725,8 @@ class SMTPHandler(logging.Handler):
                             formatdate(), msg)
             smtp.sendmail(self.fromaddr, self.toaddrs, msg)
             smtp.quit()
+        except (KeyboardInterrupt, SystemExit):
+            raise
         except:
             self.handleError(record)
 
@@ -810,6 +812,8 @@ class NTEventLogHandler(logging.Handler):
                 type = self.getEventType(record)
                 msg = self.format(record)
                 self._welu.ReportEvent(self.appname, id, cat, type, [msg])
+            except (KeyboardInterrupt, SystemExit):
+                raise
             except:
                 self.handleError(record)
 
@@ -885,6 +889,8 @@ class HTTPHandler(logging.Handler):
             if self.method == "POST":
                 h.send(data)
             h.getreply()    #can't do anything with the result
+        except (KeyboardInterrupt, SystemExit):
+            raise
         except:
             self.handleError(record)