Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-03 14:02:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Vinay Sajip 2005-10-31 13:14:19 +00:00
parent ab0f947a21
commit 85c1909a78
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/__init__.py
View file

@ -738,6 +738,8 @@ def emit(self, record):
except UnicodeError:
self.stream.write(fs % msg.encode("UTF-8"))
self.flush()
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)

6
Lib/logging/handlers.py
View file

@ -71,6 +71,8 @@ def emit(self, record):
if self.shouldRollover(record):
self.doRollover()
logging.FileHandler.emit(self, record)
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)
@ -418,6 +420,8 @@ def emit(self, record):
try:
s = self.makePickle(record)
self.send(s)
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)
@ -639,6 +643,8 @@ def emit(self, record):
self.socket.send(msg)
else:
self.socket.sendto(msg, self.address)
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)