mirror of https://github.com/python/cpython
Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and the patch.
This commit is contained in:
commit
9b727eca26
|
@ -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
|
# Permission to use, copy, modify, and distribute this software and its
|
||||||
# documentation for any purpose and without fee is hereby granted,
|
# documentation for any purpose and without fee is hereby granted,
|
||||||
|
@ -288,7 +288,7 @@ class LogRecord(object):
|
||||||
# for an example
|
# for an example
|
||||||
try:
|
try:
|
||||||
self.processName = mp.current_process().name
|
self.processName = mp.current_process().name
|
||||||
except StandardError: #pragma: no cover
|
except Exception: #pragma: no cover
|
||||||
pass
|
pass
|
||||||
if logProcesses and hasattr(os, 'getpid'):
|
if logProcesses and hasattr(os, 'getpid'):
|
||||||
self.process = os.getpid()
|
self.process = os.getpid()
|
||||||
|
|
Loading…
Reference in New Issue