Commit 40d736bc authored by Oren Milman's avatar Oren Milman Committed by Serhiy Storchaka

[2.7] bpo-31285: Don't raise a SystemError in warnings.warn_explicit() in case...

[2.7] bpo-31285: Don't raise a SystemError in warnings.warn_explicit() in case __loader__.get_source() has a bad splitlines() method. (GH-3219) (#3823)

(cherry picked from commit 91fb0afe)
parent 8b83687b
......@@ -584,6 +584,27 @@ class _WarningsTests(BaseTest):
self.assertNotIn(b'Warning!', stderr)
self.assertNotIn(b'Error', stderr)
def test_issue31285(self):
# warn_explicit() shouldn't raise a SystemError in case the return
# value of get_source() has a bad splitlines() method.
class BadLoader:
def get_source(self, fullname):
class BadSource(str):
def splitlines(self):
return 42
return BadSource('spam')
wmod = self.module
with original_warnings.catch_warnings(module=wmod):
wmod.filterwarnings('default', category=UserWarning)
with test_support.captured_stderr() as stderr:
wmod.warn_explicit(
'foo', UserWarning, 'bar', 1,
module_globals={'__loader__': BadLoader(),
'__name__': 'foobar'})
self.assertIn('UserWarning: foo', stderr.getvalue())
@test_support.cpython_only
def test_issue31411(self):
# warn_explicit() shouldn't raise a SystemError in case
......
......@@ -684,8 +684,9 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
}
/* Split the source into lines. */
source_list = PyObject_CallMethodObjArgs(source, splitlines_name,
NULL);
source_list = PyObject_CallMethodObjArgs((PyObject *)&PyString_Type,
splitlines_name, source,
NULL);
Py_DECREF(source);
if (!source_list)
return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment