python3 support, now properly handling unicode.

Author: ipartola

examples/debug.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/encrypted.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/kitchen-sink.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/message-signing.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/remote.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/simple.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

examples/udp.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys, os
 
 curdir = os.path.abspath(os.path.dirname(__file__))

loghog.py

@@ -1,5 +1,5 @@
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 import socket, hmac, hashlib, struct, zlib, ssl, random, select
 import logging, logging.handlers
 from collections import deque
@@ -130,7 +130,7 @@ def _encode(self, record):
 
         if self.secret:
             hashable_fields = ['app_id', 'module', 'stamp', 'nsecs', 'body']
-            hashable = u''.join(str(data[field]).decode('utf-8') for field in hashable_fields).encode('utf-8')
+            hashable = ''.join('{0}'.format(data[field]) for field in hashable_fields).encode('utf-8')
             data['signature'] = hmac.new(self.secret.encode('utf-8'), hashable, self.HMAC_DIGEST_ALGO).hexdigest()
 
         payload = json.dumps(data).encode('utf-8')
@@ -139,7 +139,7 @@ def _encode(self, record):
             payload = zlib.compress(payload)
 
         size = len(payload)
-        return struct.pack(self.FORMAT_PROTO.format(size), size, self.flags, payload)
+        return struct.pack(self.FORMAT_PROTO.format(size).encode('ascii'), size, self.flags, payload)
 
     def emit(self, record):
         '''Encodes and sends the messge over the network.'''

tests.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 '''
 This module contains unit test for the Python LogHog client.
 '''
@@ -10,9 +12,9 @@
 
 class LoghogClientTest(unittest.TestCase):
 
-    HEADER_FORMAT = '!LL'
+    HEADER_FORMAT = b'!LL'
     HEADER_SIZE = struct.calcsize(HEADER_FORMAT)
-    MSG_FORMAT_PROTO = '%ds'
+    MSG_FORMAT_PROTO = '{0}s'
 
     REQUIRED_FIELDS = ['version', 'stamp', 'nsecs', 'app_id', 'module', 'body', ]
     HASHABLE_FIELDS = ['app_id', 'module', 'stamp', 'nsecs', 'body']
@@ -34,7 +36,7 @@ def verify_signature(self, secret, msg):
         if secret:
             self.assertTrue('signature' in msg, 'Security alert: message signature is required but not present')
 
-            hashable = u''.join(unicode(msg[field]) for field in self.HASHABLE_FIELDS).encode('utf-8')
+            hashable = ''.join('{0}'.format(msg[field]) for field in self.HASHABLE_FIELDS).encode('utf-8')
             signature = hmac.new(secret.encode('utf-8'), hashable, self.HMAC_DIGEST_ALGO).hexdigest()
 
             self.assertEqual(signature, msg['signature'], "Message signature is invalid.")
@@ -51,11 +53,11 @@ def parse_message(self, data):
     def check_message_content(self, msg):
         self.assertEqual(msg['app_id'], 'test-app')
         self.assertEqual(msg['module'], 'web.requests')
-        self.assertEqual(msg['body'], u"That is one hot jalapño!")
+        self.assertEqual(msg['body'], "That is one hot jalapño!")
 
     def unpack_payload(self, data):
         size, flags = struct.unpack(self.HEADER_FORMAT, data[:self.HEADER_SIZE])
-        return struct.unpack(self.MSG_FORMAT_PROTO % size, data[self.HEADER_SIZE:size+self.HEADER_SIZE])[0]
+        return struct.unpack(self.MSG_FORMAT_PROTO.format(size).encode('ascii'), data[self.HEADER_SIZE:size+self.HEADER_SIZE])[0]
 
     def test_encode(self):
         handler = LoghogHandler('test-app')