https://github.com/python/cpython/commit/9b4fe9b718f27352ba0c1cf1184f5b90d77d7df4
commit: 9b4fe9b718f27352ba0c1cf1184f5b90d77d7df4
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-07-25T09:57:22+03:00
summary:
gh-122191: Fix test_warnings failure if run with -Werror (GH-122222)
__spec__.loader is now required in the module globals (see gh-86298).
files:
M Lib/test/test_warnings/__init__.py
diff --git a/Lib/test/test_warnings/__init__.py
b/Lib/test/test_warnings/__init__.py
index 7d04371c94abda..95515a4b694315 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -1,6 +1,7 @@
from contextlib import contextmanager
import linecache
import os
+import importlib
import inspect
from io import StringIO
import re
@@ -887,37 +888,46 @@ def test_issue31285(self):
# warn_explicit() should neither raise a SystemError nor cause an
# assertion failure, in case the return value of get_source() has a
# bad splitlines() method.
- def get_bad_loader(splitlines_ret_val):
+ get_source_called = []
+ def get_module_globals(*, splitlines_ret_val):
+ class BadSource(str):
+ def splitlines(self):
+ return splitlines_ret_val
+
class BadLoader:
def get_source(self, fullname):
- class BadSource(str):
- def splitlines(self):
- return splitlines_ret_val
+ get_source_called.append(splitlines_ret_val)
return BadSource('spam')
- return BadLoader()
+
+ loader = BadLoader()
+ spec = importlib.machinery.ModuleSpec('foobar', loader)
+ return {'__loader__': loader,
+ '__spec__': spec,
+ '__name__': 'foobar'}
+
wmod = self.module
with original_warnings.catch_warnings(module=wmod):
wmod.filterwarnings('default', category=UserWarning)
+ linecache.clearcache()
with support.captured_stderr() as stderr:
wmod.warn_explicit(
'foo', UserWarning, 'bar', 1,
- module_globals={'__loader__': get_bad_loader(42),
- '__name__': 'foobar'})
+ module_globals=get_module_globals(splitlines_ret_val=42))
self.assertIn('UserWarning: foo', stderr.getvalue())
+ self.assertEqual(get_source_called, [42])
- show = wmod._showwarnmsg
- try:
+ linecache.clearcache()
+ with support.swap_attr(wmod, '_showwarnmsg', None):
del wmod._showwarnmsg
with support.captured_stderr() as stderr:
wmod.warn_explicit(
'eggs', UserWarning, 'bar', 1,
- module_globals={'__loader__': get_bad_loader([42]),
- '__name__': 'foobar'})
+
module_globals=get_module_globals(splitlines_ret_val=[42]))
self.assertIn('UserWarning: eggs', stderr.getvalue())
- finally:
- wmod._showwarnmsg = show
+ self.assertEqual(get_source_called, [42, [42]])
+ linecache.clearcache()
@support.cpython_only
def test_issue31411(self):
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
