@@ -517,7 +517,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
 
             # Ignore errors caused by a signal recieved while blocking.
             # All other errors are re-raised.
-            except select.error, err:
+            except select.error as err:
                 if err[0] != errno.EINTR:
                     raise err
 
@@ -532,7 +532,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
             if ws:
                 try:
                     i = self.socket.send(self.data_send)
-                except socket.error, err:
+                except socket.error as err:
                     self.close_internal('server: %s' % err[1])
                     raise self.socket_error
 
@@ -548,7 +548,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
                 if recieving:
                     try:
                         bytes_recv = self.socket.recv(2048)
-                    except socket.error, err:
+                    except socket.error as err:
                         self.close_internal('server: %s' % err[1])
                         raise self.socket_error
 
 
@@ -19,7 +19,7 @@
 from Xlib import error
 from Xlib.protocol import request
 
-import resource
+from . import resource
 
 import re
 
 
@@ -18,7 +18,7 @@
 
 from Xlib.protocol import request
 
-import resource
+from . import resource
 
 class Cursor(resource.Resource):
     __cursor__ = resource.Resource.__resource__
@@ -29,8 +29,8 @@ def free(self, onerror = None):
                            cursor = self.id)
         self.display.free_resource_id(self.id)
 
-    def recolor(self, (fore_red, fore_green, fore_blue),
-                (back_red, back_green, back_blue), onerror = None):
+    def recolor(self, fore_red, fore_green, fore_blue,
+                back_red, back_green, back_blue, onerror = None):
 
         request.RecolorCursor(display = self.display,
                               onerror = onerror,
 
@@ -20,13 +20,13 @@
 from Xlib.protocol import request, rq
 
 # Other X resource objects
-import resource
-import colormap
-import cursor
-import fontable
+from . import resource
+from . import colormap
+from . import cursor
+from . import fontable
 
 # Inter-client communication conventions
-import icccm
+from . import icccm
 
 class Drawable(resource.Resource):
     __drawable__ = resource.Resource.__resource__
@@ -229,7 +229,7 @@ def put_pil_image(self, gc, x, y, image, onerror = None):
             unit = self.display.info.bitmap_format_scanline_unit
             stride = roundup(width * unit, pad) >> 3
         else:
-            raise ValueError, 'Unknown data format'
+            raise ValueError('Unknown data format')
 
         maxlen = (self.display.info.max_request_length << 2) \
                  - request.PutImage._request.static_size
@@ -798,8 +798,8 @@ def free(self, onerror = None):
         self.display.free_resource_id(self.id)
 
     def create_cursor(self, mask,
-                      (fore_red, fore_green, fore_blue),
-                      (back_red, back_green, back_blue),
+                      fore_red, fore_green, fore_blue,
+                      back_red, back_green, back_blue,
                       x, y):
         cid = self.display.allocate_resource_id()
         request.CreateCursor(display = self.display,
 
@@ -18,8 +18,8 @@
 
 from Xlib.protocol import request
 
-import resource
-import cursor
+from . import resource
+from . import cursor
 
 class Fontable(resource.Resource):
     __fontable__ = resource.Resource.__resource__
@@ -85,8 +85,8 @@ def close(self, onerror = None):
         self.display.free_resource_id(self.id)
 
     def create_glyph_cursor(self, mask, source_char, mask_char,
-                            (fore_red, fore_green, fore_blue),
-                            (back_red, back_green, back_blue)):
+                            fore_red, fore_green, fore_blue,
+                            back_red, back_green, back_blue):
 
         cid = self.display.allocate_resource_id()
         request.CreateGlyphCursor(display = self.display,