Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and...
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Wed, 25 Jan 2012 17:49:45 +0000 (17:49 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Wed, 25 Jan 2012 17:49:45 +0000 (17:49 +0000)
1  2 
Lib/logging/__init__.py

index a3b1c0ae2570c752025d1b65cfcf16cece6b20cf,3faad4f335fda884baf7b4519ac04a9823e3e9fa..8fe5bd99b2c60e785f059188316348b61623beea
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright 2001-2011 by Vinay Sajip. All Rights Reserved.
 -# Copyright 2001-2010 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 -294,7 +288,7 @@@ class LogRecord(object)
                  # for an example
                  try:
                      self.processName = mp.current_process().name
-                 except StandardError: #pragma: no cover
 -                except Exception:
++                except Exception: #pragma: no cover
                      pass
          if logProcesses and hasattr(os, 'getpid'):
              self.process = os.getpid()