logging: replace codecs.open with builtins.open, remove '_encoded' sort, add some tests.
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index ef17081..52e18e5 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -25,6 +25,7 @@
"""
import logging, socket, os, pickle, struct, time, re
+from codecs import BOM_UTF8
from stat import ST_DEV, ST_INO, ST_MTIME
import queue
try:
@@ -32,11 +33,6 @@
except ImportError: #pragma: no cover
threading = None
-try:
- import codecs
-except ImportError: #pragma: no cover
- codecs = None
-
#
# Some constants...
#
@@ -60,8 +56,6 @@
"""
Use the specified filename for streamed logging
"""
- if codecs is None: #pragma: no cover
- encoding = None
logging.FileHandler.__init__(self, filename, mode, encoding, delay)
self.mode = mode
self.encoding = encoding
@@ -793,9 +787,7 @@
prio = prio.encode('utf-8')
# Message is a string. Convert to bytes as required by RFC 5424
msg = msg.encode('utf-8')
- if codecs:
- msg = codecs.BOM_UTF8 + msg
- msg = prio + msg
+ msg = prio + BOM_UTF8 + msg
try:
if self.unixsocket:
try: