start() and stop() methods: return None where there is no exception;

freddrake · freddrake · commit 2c146bfa28ae · 2002-02-08T21:27:50.000Z
returning NULL causes the interpreter to raise a SystemError.
Noted by Anthony Baxter at Python 10.
diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c
@@ -1180,8 +1180,11 @@ profiler_start(ProfilerObject *self, PyObject *args)
     PyObject *result = NULL;
 
     if (PyArg_ParseTuple(args, ":start")) {
-        if (is_available(self))
+        if (is_available(self)) {
             do_start(self);
+            result = Py_None;
+            Py_INCREF(result);
+        }
     }
     return result;
 }
@@ -1198,8 +1201,11 @@ profiler_stop(ProfilerObject *self, PyObject *args)
     if (PyArg_ParseTuple(args, ":stop")) {
         if (!self->active)
             PyErr_SetString(ProfilerError, "profiler not active");
-        else
+        else {
             do_stop(self);
+            result = Py_None;
+            Py_INCREF(result);
+        }
     }
     return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -1180,8 +1180,11 @@ profiler_start(ProfilerObject self, PyObject args)`
`1180`	`1180`	`PyObject *result = NULL;`
`1181`	`1181`
`1182`	`1182`	`if (PyArg_ParseTuple(args, ":start")) {`
`1183`		`- if (is_available(self))`
	`1183`	`+ if (is_available(self)) {`
`1184`	`1184`	`do_start(self);`
	`1185`	`+ result = Py_None;`
	`1186`	`+ Py_INCREF(result);`
	`1187`	`+ }`
`1185`	`1188`	`}`
`1186`	`1189`	`return result;`
`1187`	`1190`	`}`
`@@ -1198,8 +1201,11 @@ profiler_stop(ProfilerObject self, PyObject args)`
`1198`	`1201`	`if (PyArg_ParseTuple(args, ":stop")) {`
`1199`	`1202`	`if (!self->active)`
`1200`	`1203`	`PyErr_SetString(ProfilerError, "profiler not active");`
`1201`		`- else`
	`1204`	`+ else {`
`1202`	`1205`	`do_stop(self);`
	`1206`	`+ result = Py_None;`
	`1207`	`+ Py_INCREF(result);`
	`1208`	`+ }`
`1203`	`1209`	`}`
`1204`	`1210`	`return result;`
`1205`	`1211`	`}`