bpo-32089: Use default action for ResourceWarning (#4584)
In development and debug mode, use the "default" action, rather than
the "always" action, for ResourceWarning in the default warnings
filters.
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 75f7d00..7f95fcc 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -532,26 +532,26 @@
out = self.run_xdev("-c", code)
self.assertEqual(out,
"ignore::BytesWarning "
- "always::ResourceWarning "
+ "default::ResourceWarning "
"default::Warning")
out = self.run_xdev("-b", "-c", code)
self.assertEqual(out,
"default::BytesWarning "
- "always::ResourceWarning "
+ "default::ResourceWarning "
"default::Warning")
out = self.run_xdev("-bb", "-c", code)
self.assertEqual(out,
"error::BytesWarning "
- "always::ResourceWarning "
+ "default::ResourceWarning "
"default::Warning")
out = self.run_xdev("-Werror", "-c", code)
self.assertEqual(out,
"error::Warning "
"ignore::BytesWarning "
- "always::ResourceWarning "
+ "default::ResourceWarning "
"default::Warning")
try:
@@ -573,19 +573,6 @@
out = self.run_xdev("-c", code)
self.assertEqual(out, "True")
- # Make sure that ResourceWarning emitted twice at the same line number
- # is logged twice
- filename = support.TESTFN
- self.addCleanup(support.unlink, filename)
- with open(filename, "w", encoding="utf8") as fp:
- print("def func(): open(__file__)", file=fp)
- print("func()", file=fp)
- print("func()", file=fp)
- fp.flush()
-
- out = self.run_xdev(filename)
- self.assertEqual(out.count(':1: ResourceWarning: '), 2, out)
-
class IgnoreEnvironmentTest(unittest.TestCase):
diff --git a/Lib/warnings.py b/Lib/warnings.py
index 5b62569..c4bb22e 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -540,7 +540,7 @@
# resource usage warnings are enabled by default in pydebug mode
if dev_mode or py_debug:
- resource_action = "always"
+ resource_action = "default"
else:
resource_action = "ignore"
simplefilter(resource_action, category=ResourceWarning, append=1)