summaryrefslogtreecommitdiffstats
path: root/Lib/logging/__init__.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-03-11 18:44:10 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-03-11 18:44:10 (GMT)
commit3ae81137c8b8dc93ebdf846e1224150012040b75 (patch)
tree9f0d4b990bb571dc46e133e2350bbf332c0088a6 /Lib/logging/__init__.py
parentf4d0af460a279859b75c11500f14d14a1b29ee79 (diff)
downloadcpython-3ae81137c8b8dc93ebdf846e1224150012040b75.zip
cpython-3ae81137c8b8dc93ebdf846e1224150012040b75.tar.gz
cpython-3ae81137c8b8dc93ebdf846e1224150012040b75.tar.bz2
Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.
Diffstat (limited to 'Lib/logging/__init__.py')
-rw-r--r--Lib/logging/__init__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index a3b3e39..b48bee8 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1513,15 +1513,12 @@ def shutdown(handlerList=_handlerList):
#errors might occur, for example, if files are locked
#we just ignore them if raiseExceptions is not set
try:
- h.acquire()
h.flush()
h.close()
except:
if raiseExceptions:
raise
#else, swallow
- finally:
- h.release()
#Let's try and shutdown automatically on application exit...
try: