Address comments

Author: alex-semenyuk

Lib/test/test_capi/test_sys.py

@@ -210,69 +210,60 @@ def test_sys_writestderr(self):
     def test_sys_audit(self):
         # Test PySys_Audit()
         sys_audit = _testlimitedcapi.sys_audit
-        audit_events = []
-        def audit_hook(event, args):
-            audit_events.append((event, args))
-            return None
 
-        sys.addaudithook(audit_hook)
-        try:
-            result = sys_audit("test.event", "OO", 1, "a")
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "test.event")
-            self.assertEqual(audit_events[-1][1], (1, "a"))
-
-            result = sys_audit("test.no_args", "")
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "test.no_args")
-            self.assertEqual(audit_events[-1][1], ())
-
-            with self.assertRaises(TypeError):
-                sys_audit(123, "O", 1)
-
-            result = sys_audit("テスト.イベント", "O", 42)
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "テスト.イベント")
-            self.assertEqual(audit_events[-1][1], (42,))
-
-            with self.assertRaises(UnicodeDecodeError):
-                sys_audit(b"test.non_utf8\xff", "O", 1)
-        finally:
-            sys.audit_hooks = []
+        result = sys_audit("test.event", "OO", 1, "a")
+        self.assertEqual(result, 0)
+
+        result = sys_audit("test.no_args", "")
+        self.assertEqual(result, 0)
+
+        with self.assertRaises(TypeError):
+            sys_audit(123, "O", 1)
+
+        result = sys_audit("テスト.イベント", "O", 42)
+        self.assertEqual(result, 0)
+
+        result = sys_audit(None, "O", 1)
+        self.assertEqual(result, 0)
+
+        result = sys_audit(b"test.non_utf8\xff", "O", 1)
+        self.assertEqual(result, 0)
+
+        result = sys_audit("test.event", "(")
+        self.assertEqual(result, 0)
+
+        result = sys_audit("test.event", "&")
+        self.assertEqual(result, 0)
+
+        result = sys_audit("test.event", b"\xff")
+        self.assertEqual(result, 0)
+
+        result = sys_audit("test.event", "{OO}", [], [])
+        self.assertEqual(result, 0)
+
 
     @unittest.skipIf(_testlimitedcapi is None, 'need _testlimitedcapi module')
     def test_sys_audittuple(self):
         # Test PySys_AuditTuple()
         sys_audittuple = _testlimitedcapi.sys_audittuple
-        audit_events = []
-        def audit_hook(event, args):
-            audit_events.append((event, args))
-            return None
 
-        sys.addaudithook(audit_hook)
-        try:
-            result = sys_audittuple("test.event", (1, "a"))
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "test.event")
-            self.assertEqual(audit_events[-1][1], (1, "a"))
-
-            result = sys_audittuple("test.null_tuple")
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "test.null_tuple")
-            self.assertEqual(audit_events[-1][1], ())
-
-            with self.assertRaises(TypeError):
-                sys_audittuple("test.bad_tuple", [1, 2])
-
-            result = sys_audittuple("テスト.イベント", (42,))
-            self.assertEqual(result, 0)
-            self.assertEqual(audit_events[-1][0], "テスト.イベント")
-            self.assertEqual(audit_events[-1][1], (42,))
-
-            with self.assertRaises(UnicodeDecodeError):
-                sys_audittuple(b"test.non_utf8\xff", (1,))
-        finally:
-            sys.audit_hooks = []
+        result = sys_audittuple("test.event", (1, "a"))
+        self.assertEqual(result, 0)
+
+        result = sys_audittuple("test.null_tuple")
+        self.assertEqual(result, 0)
+
+        with self.assertRaises(TypeError):
+            sys_audittuple("test.bad_tuple", [1, 2])
+
+        result = sys_audittuple("テスト.イベント", (42,))
+        self.assertEqual(result, 0)
+
+        result = sys_audittuple(None, (123,))
+        self.assertEqual(result, 0)
+
+        result = sys_audittuple(b"test.non_utf8\xff", (1,))
+        self.assertEqual(result, 0)
 
 
 if __name__ == "__main__":

Modules/_testlimitedcapi/sys.c

@@ -120,10 +120,6 @@ sys_audit(PyObject *Py_UNUSED(module), PyObject *args)
         return NULL;
     }
 
-    if (event == NULL) {
-        RETURN_INT(0);
-    }
-
     int result;
     if (arg1 == NULL) {
         result = PySys_Audit(event, argFormat);
@@ -149,15 +145,6 @@ sys_audittuple(PyObject *Py_UNUSED(module), PyObject *args)
         return NULL;
     }
 
-    if (event == NULL) {
-        RETURN_INT(0);
-    }
-
-    if (tuple_args != NULL && !PyTuple_Check(tuple_args)) {
-        PyErr_SetString(PyExc_TypeError, "second argument must be a tuple");
-        return NULL;
-    }
-
     RETURN_INT(PySys_AuditTuple(event, tuple_args));
 }