diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-27 12:11:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 12:11:55 +0100 |
| commit | 21c7730761e2a768e33b89b063a095d007dcfd2c (patch) | |
| tree | 1d96b9b8c87ed00337e15d2a8c1f287fac4ffcb1 /Lib | |
| parent | c172fc5031a4035986bef0b2fcef906706d7abf3 (diff) | |
| download | cpython-git-21c7730761e2a768e33b89b063a095d007dcfd2c.tar.gz | |
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.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_cmd_line.py | 21 | ||||
| -rw-r--r-- | Lib/warnings.py | 2 |
2 files changed, 5 insertions, 18 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 75f7d00b24..7f95fccf79 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -532,26 +532,26 @@ class CmdLineTest(unittest.TestCase): 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 @@ class CmdLineTest(unittest.TestCase): 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 5b62569c97..c4bb22ec92 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -540,7 +540,7 @@ if not _warnings_defaults: # 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) |