@@ -1,4 +1,4 @@
-from OMMClient import *
+from .OMMClient import *
 from threading import Lock
 
 
@@ -71,5 +71,5 @@ def __setattr__(self, key, value):
             self.__dict__[key] = value
 
     def _init_from_attributes(self, attributes):
-        for key, val in attributes.items():
+        for key, val in list(attributes.items()):
             self.__dict__[key] = val
@@ -1,13 +1,13 @@
 from threading import Thread, Event, Lock
-from OMUser import OMMUser
-from OMDevice import OMMDevice
+from .OMUser import OMMUser
+from .OMDevice import OMMDevice
 from time import sleep
 from events import Events
-from utils import *
-from messagehelper import *
+from .utils import *
+from .messagehelper import *
 import socket
 import ssl
-import Queue
+import queue
 
 
 # noinspection PyMissingConstructor
@@ -46,8 +46,8 @@ def __init__(self, host, port=12622):
         self._tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self._tcp_socket.settimeout(10)
         self._ssl_socket = ssl.wrap_socket(self._tcp_socket)
-        self._send_q = Queue.Queue()
-        self._recv_q = Queue.Queue()
+        self._send_q = queue.Queue()
+        self._recv_q = queue.Queue()
         self._worker = Thread(target=self._work)
         self._worker.daemon = True
         self._dispatcher = Thread(target=self._dispatch)
@@ -531,7 +531,7 @@ def _work(self):
             data = None
             try:
                 data = self._ssl_socket.recv(65536)
-            except Exception, e:
+            except Exception as e:
                 if e.message == "The read operation timed out":
                     continue
             if data:
 
@@ -1,4 +1,4 @@
-from OMMClient import *
+from .OMMClient import *
 from threading import Lock
 
 
@@ -106,12 +106,12 @@ def __setattr__(self, key, value):
             self.__dict__[key] = value
 
     def _init_from_attributes(self, attributes):
-        for key, val in attributes.items():
+        for key, val in list(attributes.items()):
             self.__dict__[key] = val
 
     def get_attributes(self):
         attributes = {}
-        for key, val in self.__dict__.items():
+        for key, val in list(self.__dict__.items()):
             if "_" in key:
                 attributes[key] = val
         return attributes
@@ -121,4 +121,4 @@ def commit(self):
             return True
         with self._changelock:
             for change in self._changes:
-                print change
+                print(change)
@@ -30,14 +30,14 @@ def construct_message(name, attributes=None, children=None):
     impl = getDOMImplementation()
     message = impl.createDocument(None, name, None)
     root_element = message.documentElement
-    for key, val in attributes.items():
+    for key, val in list(attributes.items()):
         root_element.setAttribute(str(key), str(val))
     if children is not None:
-        for key, val in children.items():
+        for key, val in list(children.items()):
             new_child = message.createElement(key)
             if val is not None:
-                for attr_key, attr_val in val.items():
+                for attr_key, attr_val in list(val.items()):
                     new_child.setAttribute(str(attr_key), str(attr_val))
             root_element.appendChild(new_child)
-    print root_element.toxml()
+    print(root_element.toxml())
     return root_element.toxml()
@@ -23,14 +23,14 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-mitel'
-copyright = u'2017, thomasDOTwtf'
-author = u'thomasDOTwtf'
+project = 'python-mitel'
+copyright = '2017, thomasDOTwtf'
+author = 'thomasDOTwtf'
 
 # The short X.Y version.
-version = u'0.1'
+version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.1'
+release = '0.1'
 
 language = None
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
@@ -15,7 +15,7 @@ def HandsetHandler(message, attributes, children):
 
 test = OMMClient.OMMClient(host, port)
 test.login(user, password, ommsync=True)
-print test.get_device(35)
+print(test.get_device(35))
 #print test.create_user("test1","3332",login="3332",pin="1234")
 #test.attach_user_device(1, 36)
 #test.detach_user_device(5, 35)