Fix line endings (to emit CRLF on Windows) when opening with a declared encoding such as 'utf-16'. Also allow customizing line endings if for some weird reason you wanted to emit CRLF on Unix.

This should address issue #19 and PR #20.

Author: Preston-Landers

src/concurrent_log_handler/__init__.py

@@ -52,6 +52,7 @@
 
 """
 
+import io
 import os
 import sys
 import time
@@ -63,11 +64,6 @@
 
 from portalocker import LOCK_EX, lock, unlock
 
-try:
-    import codecs
-except ImportError:
-    codecs = None
-
 try:
     import pwd
     import grp
@@ -122,7 +118,7 @@ class ConcurrentRotatingFileHandler(BaseRotatingHandler):
 
     def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
                  encoding=None, debug=False, delay=None, use_gzip=False,
-                 owner=None, chmod=None, umask=None):
+                 owner=None, chmod=None, umask=None, newline=None, terminator="\n"):
         """
         Open the specified file and use it as the stream for logging.
 
@@ -140,6 +136,10 @@ def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
             This is an alternative to chmod. It is mainly for Unix systems but
             can also be used on Windows. The Windows security model is more complex
             and this is not the same as changing access control entries.
+        :param newline: None (default): use CRLF on Windows, LF on Unix. Set to '' for
+        no translation, in which case the 'terminator' argument determines the line ending.
+        :param terminator: set to '\r\n' along with newline='' to force Windows style
+        newlines regardless of OS platform.
 
         By default, the file grows indefinitely. You can specify particular
         values of maxBytes and backupCount to allow the file to rollover at
@@ -177,6 +177,7 @@ def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
         self._rotateFailed = False
         self.maxBytes = maxBytes
         self.backupCount = backupCount
+        self.newline = newline
 
         self._debug = debug
         self.use_gzip = True if gzip and use_gzip else False
@@ -194,8 +195,7 @@ def __init__(self, filename, mode='a', maxBytes=0, backupCount=0,
         super(ConcurrentRotatingFileHandler, self).__init__(
             filename, mode, encoding=encoding, delay=True)
 
-        if not hasattr(self, "terminator"):
-            self.terminator = "\n"
+        self.terminator = terminator or "\n"
 
         if owner and os.chown and pwd and grp:
             self._set_uid = pwd.getpwnam(self.owner[0]).pw_uid
@@ -250,10 +250,9 @@ def do_open(self, mode=None):
             mode = self.mode
 
         with self._alter_umask():
-            if self.encoding is None:
-                stream = open(self.baseFilename, mode)
-            else:
-                stream = codecs.open(self.baseFilename, mode, self.encoding)
+            # noinspection PyArgumentList
+            stream = io.open(
+                self.baseFilename, mode=mode, encoding=self.encoding, newline=self.newline)
 
         self._do_chown_and_chmod(self.baseFilename)