https://github.com/python/cpython/commit/40d736bcf40c10aa5fc7d6cc305a6641afd... commit: 40d736bcf40c10aa5fc7d6cc305a6641afd3cd0e branch: 2.7 author: Oren Milman <orenmn@gmail.com> committer: Serhiy Storchaka <storchaka@gmail.com> date: 2017-09-30T17:06:55+03:00 summary: [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 91fb0af) files: M Lib/test/test_warnings.py M Python/_warnings.c diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index 0023363832c..ae081eeee3f 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -584,6 +584,27 @@ def test_stderr_none(self): 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 diff --git a/Python/_warnings.c b/Python/_warnings.c index dd168f92593..37875e56199 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -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;