xobject/drawable: small cleanup

benoit-pierre · benoit-pierre · commit 6a945dcf99a5 · 2016-08-02T07:39:14.000+02:00
Avoid redefining 'type' builtin.
diff --git a/Xlib/xobject/drawable.py b/Xlib/xobject/drawable.py
@@ -421,16 +421,15 @@ def query_tree(self):
         return request.QueryTree(display = self.display,
                                  window = self.id)
 
-
-    def change_property(self, property, type, format, data,
+    def change_property(self, property, property_type, format, data,
                         mode = X.PropModeReplace, onerror = None):
 
         request.ChangeProperty(display = self.display,
                                onerror = onerror,
                                mode = mode,
                                window = self.id,
                                property = property,
-                               type = type,
+                               type = property_type,
                                data = (format, data))
 
     def delete_property(self, property, onerror = None):
@@ -439,12 +438,12 @@ def delete_property(self, property, onerror = None):
                                window = self.id,
                                property = property)
 
-    def get_property(self, property, type, offset, length, delete = 0):
+    def get_property(self, property, property_type, offset, length, delete = 0):
         r = request.GetProperty(display = self.display,
                                 delete = delete,
                                 window = self.id,
                                 property = property,
-                                type = type,
+                                type = property_type,
                                 long_offset = offset,
                                 long_length = length)
 
@@ -456,12 +455,12 @@ def get_property(self, property, type, offset, length, delete = 0):
         else:
             return None
 
-    def get_full_property(self, property, type, sizehint = 10):
-        prop = self.get_property(property, type, 0, sizehint)
+    def get_full_property(self, property, property_type, sizehint = 10):
+        prop = self.get_property(property, property_type, 0, sizehint)
         if prop:
             val = prop.value
             if prop.bytes_after:
-                prop = self.get_property(property, type, sizehint,
+                prop = self.get_property(property, property_type, sizehint,
                                          prop.bytes_after // 4 + 1)
                 val = val + prop.value
 
