Merge branch 'py3k'

1 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/Logger.py b/src/lib/Logger.py
index ae73a6d41..b49a7069f 100644
--- a/src/lib/Logger.py
+++ b/src/lib/Logger.py
@@ -10,6 +10,8 @@ import socket
 import struct
 import sys
 import termios
+# Compatibility import
+from Bcfg2.Bcfg2Py3k import fprint
 
 logging.raiseExceptions = 0
 
@@ -116,7 +118,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
     def emit(self, record):
         """Chunk and deliver records."""
         record.name = self.procname
-        if str(record.msg) > 250:
+        if len(record.msg) > 250:
             msgs = []
             error = record.exc_info
             record.exc_info = None
@@ -134,7 +136,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
                                                                 newrec.levelname.lower()),
                                             self.format(newrec))
             try:
-                self.socket.send(msg)
+                self.socket.send(msg.encode('ascii'))
             except socket.error:
                 for i in range(10):
                     try:
@@ -229,7 +231,7 @@ def trace_process(**kwargs):
                 filename = filename[:-1]
             name = frame.f_globals["__name__"]
             line = linecache.getline(filename, lineno)
-            print >> log_file, "%s:%s: %s" % (name, lineno, line.rstrip())
+            fprint("%s:%s: %s" % (name, lineno, line.rstrip()), log_file)
         return traceit
 
     sys.settrace(traceit)