Update NTEventLogHandler by review comments

Author: aisk

Lib/logging/handlers.py

@@ -1156,14 +1156,15 @@ def __init__(self, appname, dllname=None, logtype="Application"):
             pass
         self.deftype = _winapi.EVENTLOG_ERROR_TYPE
         self.typemap = {
-            logging.DEBUG   : _winapi.EVENTLOG_INFORMATION_TYPE,
-            logging.INFO    : _winapi.EVENTLOG_INFORMATION_TYPE,
-            logging.WARNING : _winapi.EVENTLOG_WARNING_TYPE,
-            logging.ERROR   : _winapi.EVENTLOG_ERROR_TYPE,
+            logging.DEBUG: _winapi.EVENTLOG_INFORMATION_TYPE,
+            logging.INFO: _winapi.EVENTLOG_INFORMATION_TYPE,
+            logging.WARNING: _winapi.EVENTLOG_WARNING_TYPE,
+            logging.ERROR: _winapi.EVENTLOG_ERROR_TYPE,
             logging.CRITICAL: _winapi.EVENTLOG_ERROR_TYPE,
         }
 
-    def _add_source_to_registry(self, appname, dllname, logtype):
+    @staticmethod
+    def _add_source_to_registry(appname, dllname, logtype):
         import winreg
 
         key_path = f"SYSTEM\\CurrentControlSet\\Services\\EventLog\\{logtype}\\{appname}"
@@ -1212,22 +1213,21 @@ def emit(self, record):
         Determine the message ID, event category and event type. Then
         log the message in the NT event log.
         """
-        if self._winapi:
-            try:
-                id = self.getMessageID(record)
-                cat = self.getEventCategory(record)
-                type = self.getEventType(record)
-                msg = self.format(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)
-            except Exception:
-                self.handleError(record)
+        try:
+            id = self.getMessageID(record)
+            cat = self.getEventCategory(record)
+            type = self.getEventType(record)
+            msg = self.format(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)
+        except Exception:
+            self.handleError(record)
 
     def close(self):
         """

Lib/test/test_logging.py

@@ -7221,14 +7221,14 @@ def test_basic(self):
         self.assertTrue(found, msg=msg)
 
     @unittest.skipUnless(sys.platform == "win32", "Windows required for this test")
-    def test_updated_implementation(self):
-        h = logging.handlers.NTEventLogHandler('test_updated')
+    def test_without_pywin32(self):
+        h = logging.handlers.NTEventLogHandler('python_test')
         self.addCleanup(h.close)
 
         # Verify that the handler uses _winapi module
         self.assertIsNotNone(h._winapi, "_winapi module should be available")
 
-        r = logging.makeLogRecord({'msg': 'Test Updated Implementation'})
+        r = logging.makeLogRecord({'msg': 'Hello!'})
         h.emit(r)