[Python-checkins] r77893 - in python/branches/release26-maint: Lib/test/test_sys.py Misc/NEWS Python/sysmodule.c

[victor.stinner]

Author: victor.stinner
Date: Sun Jan 31 23:33:22 2010
New Revision: 77893

Log:
Merged revisions 77892 via svnmerge from 
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_sys.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Python/sysmodule.c

Modified: python/branches/release26-maint/Lib/test/test_sys.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_sys.py	(original)
+++ python/branches/release26-maint/Lib/test/test_sys.py	Sun Jan 31 23:33:22 2010
@@ -391,6 +391,10 @@
         out = p.stdout.read().strip()
         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):
 

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Jan 31 23:33:22 2010
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #7819: Check sys.call_tracing() arguments types.
+
 - Issue #7788: Fix an interpreter crash produced by deleting a list
   slice with very large step value.
 

Modified: python/branches/release26-maint/Python/sysmodule.c
==============================================================================
--- python/branches/release26-maint/Python/sysmodule.c	(original)
+++ python/branches/release26-maint/Python/sysmodule.c	Sun Jan 31 23:33:22 2010
@@ -802,7 +802,7 @@
 sys_call_tracing(PyObject *self, PyObject *args)
 {
 	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 _PyEval_CallTracing(func, funcargs);
 }