Update by review comments

Author: aisk

Lib/logging/handlers.py

@@ -1221,11 +1221,10 @@ def emit(self, record):
 
             # Get a handle to the event log
             handle = self._winapi.RegisterEventSource(None, self.appname)
-            if handle != self._winapi.INVALID_HANDLE_VALUE:
-                try:
-                    self._winapi.ReportEvent(handle, type, cat, id, msg)
-                finally:
-                    self._winapi.DeregisterEventSource(handle)
+            try:
+                self._winapi.ReportEvent(handle, type, cat, id, msg)
+            finally:
+                self._winapi.DeregisterEventSource(handle)
         except Exception:
             self.handleError(record)
 

Lib/test/test_winapi.py

@@ -161,13 +161,16 @@ def test_event_source_registration(self):
         source_name = "PythonTestEventSource"
 
         handle = _winapi.RegisterEventSource(None, source_name)
+        self.addCleanup(_winapi.DeregisterEventSource, handle)
         self.assertNotEqual(handle, _winapi.INVALID_HANDLE_VALUE)
 
-        with self.assertRaisesRegex(OSError, '[WinError 87]'):
+        with self.assertRaises(OSError) as cm:
             _winapi.RegisterEventSource(None, "")
+        self.assertEqual(cm.exception.winerror, 87)
 
-        with self.assertRaisesRegex(OSError, '[WinError 6]'):
+        with self.assertRaises(OSError) as cm:
             _winapi.DeregisterEventSource(_winapi.INVALID_HANDLE_VALUE)
+        self.assertEqual(cm.exception.winerror, 6)
 
     def test_report_event(self):
         source_name = "PythonTestEventSource"
@@ -176,15 +179,15 @@ def test_report_event(self):
         self.assertNotEqual(handle, _winapi.INVALID_HANDLE_VALUE)
         self.addCleanup(_winapi.DeregisterEventSource, handle)
 
-        # Test with strings and raw data
-        test_strings = ["Test message 1", "Test message 2"]
-        test_data = b"test raw data"
         _winapi.ReportEvent(handle, _winapi.EVENTLOG_SUCCESS, 1, 1002,
-                            test_strings, test_data)
+                            "Test message 1")
+
+        with self.assertRaises(TypeError):
+            _winapi.ReportEvent(handle, _winapi.EVENTLOG_SUCCESS, 1, 1002, 42)
 
-        # Test with empty strings list
-        _winapi.ReportEvent(handle, _winapi.EVENTLOG_AUDIT_FAILURE, 2, 1003, [])
+        with self.assertRaises(TypeError):
+            _winapi.ReportEvent(handle, _winapi.EVENTLOG_SUCCESS, 1, 1002, None)
 
-        with self.assertRaisesRegex(TypeError, 'expected a list of strings, not int'):
-            _winapi.ReportEvent(handle, _winapi.EVENTLOG_ERROR_TYPE, 0, 1001,
-                                ["string", 123])
+        with self.assertRaises(ValueError):
+            _winapi.ReportEvent(handle, _winapi.EVENTLOG_SUCCESS, 1, 1002,
+                                "Test message \0 with embedded null character")

Modules/_winapi.c

@@ -3029,8 +3029,9 @@ _winapi_DeregisterEventSource_impl(PyObject *module, HANDLE handle)
     success = DeregisterEventSource(handle);
     Py_END_ALLOW_THREADS
 
-    if (!success)
+    if (!success) {
         return PyErr_SetFromWindowsErr(0);
+    }
 
     Py_RETURN_NONE;
 }