python2 fixes

Author: Tony Crisci

i3ipc/i3ipc.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import sys
 import errno
 import struct
 import json
@@ -12,6 +13,8 @@
 from threading import Timer, Lock
 import time
 
+python2 = sys.version_info[0] < 3
+
 
 class MessageType(Enum):
     COMMAND = 0
@@ -471,10 +474,15 @@ def _wait_for_socket(self):
         return socket_path_exists
 
     def message(self, message_type, payload):
+        if python2:
+            ErrorType = IOError
+        else:
+            ErrorType = ConnectionError
+
         try:
             self.cmd_lock.acquire()
             return self._ipc_send(self.cmd_socket, message_type, payload)
-        except BrokenPipeError as e:
+        except ErrorType as e:
             if not self.auto_reconnect:
                 raise (e)
 

test/test_get_config.py

@@ -1,10 +1,10 @@
 from ipctest import IpcTest
 import i3ipc
-
+import io
 
 class TestGetConfig(IpcTest):
     def test_get_config(self, i3):
         config = i3.get_config()
         assert isinstance(config, i3ipc.ConfigReply)
-        with open('test/i3.config') as f:
+        with io.open('test/i3.config', 'r', encoding='utf-8') as f:
             assert config.config == f.read()

test/test_get_marks.py

@@ -1,3 +1,6 @@
+# coding=utf-8
+from __future__ import unicode_literals
+
 from ipctest import IpcTest
 import i3ipc