From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 25 Jan 2012 17:49:45 +0000 (+0000)
Subject: Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and... 
X-Git-Tag: v3.3.0a1~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b727eca26ac97e2029dff669cf031d3ae5150c2;p=python

Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and the patch.
---

9b727eca26ac97e2029dff669cf031d3ae5150c2
diff --cc Lib/logging/__init__.py
index a3b1c0ae25,3faad4f335..8fe5bd99b2
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@@ -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()