mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
bpo-26789: Fix logging.FileHandler._open() at exit (GH-23053)
The logging.FileHandler class now keeps a reference to the builtin open() function to be able to open or reopen the file during Python finalization. Fix errors like: Exception ignored in: (...) Traceback (most recent call last): (...) File ".../logging/__init__.py", line 1463, in error File ".../logging/__init__.py", line 1577, in _log File ".../logging/__init__.py", line 1587, in handle File ".../logging/__init__.py", line 1649, in callHandlers File ".../logging/__init__.py", line 948, in handle File ".../logging/__init__.py", line 1182, in emit File ".../logging/__init__.py", line 1171, in _open NameError: name 'open' is not defined
This commit is contained in:
parent
5cf4782a26
commit
45df61fd2d
4 changed files with 50 additions and 8 deletions
|
@ -4310,8 +4310,8 @@ class ModuleLevelMiscTest(BaseTest):
|
|||
logging.setLoggerClass(logging.Logger)
|
||||
|
||||
def test_logging_at_shutdown(self):
|
||||
# Issue #20037
|
||||
code = """if 1:
|
||||
# bpo-20037: Doing text I/O late at interpreter shutdown must not crash
|
||||
code = textwrap.dedent("""
|
||||
import logging
|
||||
|
||||
class A:
|
||||
|
@ -4321,22 +4321,55 @@ class ModuleLevelMiscTest(BaseTest):
|
|||
except Exception:
|
||||
logging.exception("exception in __del__")
|
||||
|
||||
a = A()"""
|
||||
a = A()
|
||||
""")
|
||||
rc, out, err = assert_python_ok("-c", code)
|
||||
err = err.decode()
|
||||
self.assertIn("exception in __del__", err)
|
||||
self.assertIn("ValueError: some error", err)
|
||||
|
||||
def test_logging_at_shutdown_open(self):
|
||||
# bpo-26789: FileHandler keeps a reference to the builtin open()
|
||||
# function to be able to open or reopen the file during Python
|
||||
# finalization.
|
||||
filename = os_helper.TESTFN
|
||||
self.addCleanup(os_helper.unlink, filename)
|
||||
|
||||
code = textwrap.dedent(f"""
|
||||
import builtins
|
||||
import logging
|
||||
|
||||
class A:
|
||||
def __del__(self):
|
||||
logging.error("log in __del__")
|
||||
|
||||
# basicConfig() opens the file, but logging.shutdown() closes
|
||||
# it at Python exit. When A.__del__() is called,
|
||||
# FileHandler._open() must be called again to re-open the file.
|
||||
logging.basicConfig(filename={filename!r})
|
||||
|
||||
a = A()
|
||||
|
||||
# Simulate the Python finalization which removes the builtin
|
||||
# open() function.
|
||||
del builtins.open
|
||||
""")
|
||||
assert_python_ok("-c", code)
|
||||
|
||||
with open(filename) as fp:
|
||||
self.assertEqual(fp.read().rstrip(), "ERROR:root:log in __del__")
|
||||
|
||||
def test_recursion_error(self):
|
||||
# Issue 36272
|
||||
code = """if 1:
|
||||
code = textwrap.dedent("""
|
||||
import logging
|
||||
|
||||
def rec():
|
||||
logging.error("foo")
|
||||
rec()
|
||||
|
||||
rec()"""
|
||||
rec()
|
||||
""")
|
||||
rc, out, err = assert_python_failure("-c", code)
|
||||
err = err.decode()
|
||||
self.assertNotIn("Cannot recover from stack overflow.", err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue