mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 77892 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77892 | victor.stinner | 2010-01-31 23:32:15 +0100 (dim., 31 janv. 2010) | 4 lines

  Issue #7819: Check sys.call_tracing() arguments types.

  py3k was already patched by issue #3661.
........
This commit is contained in:
Victor Stinner 2010-01-31 22:33:22 +00:00
parent 22697c0c72
commit d85f1c01af
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_sys.py
View file

@ -391,6 +391,10 @@ class SysModuleTest(unittest.TestCase):
out = p.stdout.read().strip() out = p.stdout.read().strip()
self.assertEqual(out, '?') self.assertEqual(out, '?')
def test_call_tracing(self):
self.assertEqual(sys.call_tracing(str, (2,)), "2")
self.assertRaises(TypeError, sys.call_tracing, str, 2)
class SizeofTest(unittest.TestCase): class SizeofTest(unittest.TestCase):

2
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 2.6.5
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #7819: Check sys.call_tracing() arguments types.
- Issue #7788: Fix an interpreter crash produced by deleting a list - Issue #7788: Fix an interpreter crash produced by deleting a list
slice with very large step value. slice with very large step value.

2
Python/sysmodule.c
View file

@ -802,7 +802,7 @@ static PyObject *
sys_call_tracing(PyObject *self, PyObject *args) sys_call_tracing(PyObject *self, PyObject *args)
{ {
PyObject *func, *funcargs; PyObject *func, *funcargs;
if (!PyArg_UnpackTuple(args, "call_tracing", 2, 2, &func, &funcargs)) if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs))
return NULL; return NULL;
return _PyEval_CallTracing(func, funcargs); return _PyEval_CallTracing(func, funcargs);
} }