diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-01-25 17:49:45 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-01-25 17:49:45 (GMT) |
| commit | 9b727eca26ac97e2029dff669cf031d3ae5150c2 (patch) | |
| tree | 2641e10180e450b7dd0f4dd662e7da85545fd82e | |
| parent | 581616624da7918e1050f3d02d0fb1e66e68c332 (diff) | |
| parent | a50c28407687b8baf1ea12f4adbf2516223a12a2 (diff) | |
| download | cpython-9b727eca26ac97e2029dff669cf031d3ae5150c2.zip cpython-9b727eca26ac97e2029dff669cf031d3ae5150c2.tar.gz cpython-9b727eca26ac97e2029dff669cf031d3ae5150c2.tar.bz2 | |
Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and the patch.
| -rw-r--r-- | Lib/logging/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index a3b1c0a..8fe5bd9 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2001-2011 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -288,7 +288,7 @@ class LogRecord(object): # for an example try: self.processName = mp.current_process().name - except StandardError: #pragma: no cover + except Exception: #pragma: no cover pass if logProcesses and hasattr(os, 'getpid'): self.process = os.getpid() |