From 0dd3aa2864c710d560d149e2fd1dbe89317ee0f6 Mon Sep 17 00:00:00 2001 From: "vinay.sajip" Date: Mon, 31 Oct 2005 13:14:19 +0000 Subject: [PATCH] Exception handling now raises KeyboardInterrupt and SystemExit rather than passing to handleError git-svn-id: http://svn.python.org/projects/python/trunk@41358 6015fed2-1504-0410-9fe1-9d1591cc4771 --- Lib/logging/__init__.py | 2 ++ Lib/logging/handlers.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index ac734e541e..5a0b0f5021 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -738,6 +738,8 @@ class StreamHandler(Handler): except UnicodeError: self.stream.write(fs % msg.encode("UTF-8")) self.flush() + except (KeyboardInterrupt, SystemExit): + raise except: self.handleError(record) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 0182dfede2..e0ab788f32 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -71,6 +71,8 @@ class BaseRotatingHandler(logging.FileHandler): if self.shouldRollover(record): self.doRollover() logging.FileHandler.emit(self, record) + except (KeyboardInterrupt, SystemExit): + raise except: self.handleError(record) @@ -418,6 +420,8 @@ class SocketHandler(logging.Handler): try: s = self.makePickle(record) self.send(s) + except (KeyboardInterrupt, SystemExit): + raise except: self.handleError(record) @@ -639,6 +643,8 @@ class SysLogHandler(logging.Handler): self.socket.send(msg) else: self.socket.sendto(msg, self.address) + except (KeyboardInterrupt, SystemExit): + raise except: self.handleError(record) -- 2.11.4.GIT