xobjects: fix Python 3 support changes

benoit-pierre · benoit-pierre · commit 65eefb599afb · 2016-06-27T13:19:56.000+02:00
Rework so the API is backward compatible.
diff --git a/Xlib/xobject/cursor.py b/Xlib/xobject/cursor.py
@@ -29,8 +29,9 @@ 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, foreground, background, onerror=None):
+        fore_red, fore_green, fore_blue = foreground
+        back_red, back_green, back_blue = background
 
         request.RecolorCursor(display = self.display,
                               onerror = onerror,
diff --git a/Xlib/xobject/drawable.py b/Xlib/xobject/drawable.py
@@ -797,10 +797,9 @@ 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,
-                      x, y):
+    def create_cursor(self, mask, foreground, background, x, y):
+        fore_red, fore_green, fore_blue = foreground
+        back_red, back_green, back_blue = background
         cid = self.display.allocate_resource_id()
         request.CreateCursor(display = self.display,
                              cid = cid,
diff --git a/Xlib/xobject/fontable.py b/Xlib/xobject/fontable.py
@@ -85,8 +85,9 @@ 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):
+                            foreground, background):
+        fore_red, fore_green, fore_blue = foreground
+        back_red, back_green, back_blue = background
 
         cid = self.display.allocate_resource_id()
         request.CreateGlyphCursor(display = self.display,
