Whitespace fixes, also a (probable?) build fix.

Author: tych0

debian/changelog

@@ -1,4 +1,10 @@
-python-xpybng (1.3-oneiric5) oneiric; urgency=low
+xpyb-ng (1.3-precise2) precise; urgency=low
+
+  * (Potentially?) fix a build error
+
+ -- Tycho Andersen <tycho@tycho.ws>  Sat, 27 Feb 2012 17:40:09 -0600
+
+xpyb-ng (1.3-precise1) precise; urgency=low
 
   * Initial release
 

debian/control

@@ -1,12 +1,11 @@
-Source: python-xpybng
+Source: xpyb-ng
 Section: universe/python
 Priority: optional
 Maintainer: Tycho Andersen <tycho@tycho.ws>
 Build-Depends: debhelper (>= 8.0.0), libxcb1-dev, python-dev, python-xcbgen, xcb-proto
 Standards-Version: 3.9.2
 Homepage: <https://github.com/tych0/xpyb-ng>
 Vcs-Git: git@github.com:tych0/xpyb-ng.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/xpybng.git;a=summary
 
 Package: python-xpybng
 Architecture: any

tools/py_client.py

@@ -255,7 +255,7 @@ def _py_get_length_field(expr):
     '''
     if expr.lenfield_name != None:
         # This would be nicer if Request had an is_request attribute...
-        if hasattr(expr.parent.parent, "opcode"):
+        if hasattr(expr.parent, "parent") and hasattr(expr.parent.parent, "opcode"):
             return expr.lenfield_name
         else:
             return 'self.%s' % expr.lenfield_name

xcb/cookie.c

@@ -23,7 +23,7 @@ static void
 xpybCookie_dealloc(xpybCookie *self)
 {
     if (self->conn->conn)
-	xcb_discard_reply(self->conn->conn, self->cookie.sequence);
+        xcb_discard_reply(self->conn->conn, self->cookie.sequence);
 
     Py_CLEAR(self->reply_type);
     Py_CLEAR(self->request);
@@ -50,15 +50,15 @@ xpybCookie_check(xpybCookie *self, PyObject *args)
     xpybRequest_get_attributes(self->request, &is_void, NULL, &is_checked);
 
     if (!(is_void && is_checked)) {
-	PyErr_SetString(xpybExcept_base, "Request is not void and checked.");
-	return NULL;
+        PyErr_SetString(xpybExcept_base, "Request is not void and checked.");
+        return NULL;
     }
     if (xpybConn_invalid(self->conn))
-	return NULL;
+        return NULL;
 
     error = xcb_request_check(self->conn->conn, self->cookie);
     if (xpybError_set(self->conn, error))
-	return NULL;
+        return NULL;
 
     Py_RETURN_NONE;
 }
@@ -75,25 +75,25 @@ xpybCookie_reply(xpybCookie *self, PyObject *args)
 
     /* Check arguments and connection. */
     if (is_void) {
-	PyErr_SetString(xpybExcept_base, "Request has no reply.");
-	return NULL;
+        PyErr_SetString(xpybExcept_base, "Request has no reply.");
+        return NULL;
     }
     if (xpybConn_invalid(self->conn))
-	return NULL;
+        return NULL;
 
     /* Make XCB call */
     data = xcb_wait_for_reply(self->conn->conn, self->cookie.sequence, &error);
     if (xpybError_set(self->conn, error))
-	return NULL;
+        return NULL;
     if (data == NULL) {
-	PyErr_SetString(PyExc_IOError, "I/O error on X server connection.");
-	return NULL;
+        PyErr_SetString(PyExc_IOError, "I/O error on X server connection.");
+        return NULL;
     }
 
     /* Create a shim protocol object */
     shim = PyBuffer_FromMemory(data, 32 + data->length * 4);
     if (shim == NULL)
-	goto err1;
+        goto err1;
 
     /* Call the reply type object to get a new xcb.Reply instance */
     reply = PyObject_CallFunctionObjArgs((PyObject *)self->reply_type, shim, NULL);
@@ -144,7 +144,7 @@ int xpybCookie_modinit(PyObject *m)
         return -1;
     Py_INCREF(&xpybCookie_type);
     if (PyModule_AddObject(m, "Cookie", (PyObject *)&xpybCookie_type) < 0)
-	return -1;
+        return -1;
 
     return 0;
 }

xcb/ext.c

@@ -28,7 +28,7 @@ xpybExt_init(xpybExt *self, PyObject *args)
     xpybExtkey *key = (xpybExtkey *)Py_None;
 
     if (!PyArg_ParseTuple(args, "O!|O!", &xpybConn_type, &conn, &xpybExtkey_type, &key))
-	return -1;
+        return -1;
 
     Py_INCREF(self->key = key);
     Py_INCREF(self->conn = conn);
@@ -105,15 +105,15 @@ xpybExt_send_request(xpybExt *self, PyObject *args, PyObject *kw)
                                      xpybRequest_type, &request,
                                      &xpybCookie_type, &cookie,
                                      &PyType_Type, &reply))
-	return NULL;
+        return NULL;
 
     xpybRequest_get_attributes(request, &is_void, &opcode, &is_checked);
 
     if (!is_void)
-	if (reply == NULL || !PyType_IsSubtype(reply, xpybReply_type)) {
-	    PyErr_SetString(xpybExcept_base, "Reply type missing or not derived from xcb.Reply.");
-	    return NULL;
-	}
+        if (reply == NULL || !PyType_IsSubtype(reply, xpybReply_type)) {
+            PyErr_SetString(xpybExcept_base, "Reply type missing or not derived from xcb.Reply.");
+            return NULL;
+        }
 
     /* Set up request structure */
     xcb_req.count = 2;
@@ -123,7 +123,7 @@ xpybExt_send_request(xpybExt *self, PyObject *args, PyObject *kw)
 
     /* Allocate and fill in data strings */
     if (PyObject_AsReadBuffer(((xpybProtobj *)request)->buf, &data, &size) < 0)
-	return NULL;
+        return NULL;
     xcb_parts[2].iov_base = (void *)data;
     xcb_parts[2].iov_len = size;
     xcb_parts[3].iov_base = 0;
@@ -180,7 +180,7 @@ int xpybExt_modinit(PyObject *m)
         return -1;
     Py_INCREF(&xpybExt_type);
     if (PyModule_AddObject(m, "Extension", (PyObject *)&xpybExt_type) < 0)
-	return -1;
+        return -1;
 
     return 0;
 }

xcb/protobj.c

@@ -41,21 +41,21 @@ xpybError_set(xpybConn *conn, xcb_generic_error_t *e)
     except = xpybExcept_proto;
 
     if (e) {
-	opcode = e->error_code;
-	if (opcode < conn->errors_len && conn->errors[opcode] != NULL) {
-	    type = PyTuple_GET_ITEM(conn->errors[opcode], 0);
-	    except = PyTuple_GET_ITEM(conn->errors[opcode], 1);
-	}
-
-	shim = PyBuffer_FromMemory(e, sizeof(*e));
-	if (shim == NULL)
-	    return 1;
-
-	error = PyObject_CallFunctionObjArgs(type, shim, NULL);
-	if (error != NULL)
-	    PyErr_SetObject(except, error);
-	Py_DECREF(shim);
-	return 1;
+        opcode = e->error_code;
+        if (opcode < conn->errors_len && conn->errors[opcode] != NULL) {
+            type = PyTuple_GET_ITEM(conn->errors[opcode], 0);
+            except = PyTuple_GET_ITEM(conn->errors[opcode], 1);
+        }
+
+        shim = PyBuffer_FromMemory(e, sizeof(*e));
+        if (shim == NULL)
+            return 1;
+
+        error = PyObject_CallFunctionObjArgs(type, shim, NULL);
+        if (error != NULL)
+            PyErr_SetObject(except, error);
+        Py_DECREF(shim);
+        return 1;
     }
     return 0;
 }
@@ -67,11 +67,11 @@ xpybEvent_create(xpybConn *conn, xcb_generic_event_t *e)
     PyObject *shim, *event, *type = (PyObject *)xpybEvent_type;
 
     if (opcode < conn->events_len && conn->events[opcode] != NULL)
-	type = conn->events[opcode];
+        type = conn->events[opcode];
 
     shim = PyBuffer_FromMemory(e, sizeof(*e));
     if (shim == NULL)
-	return NULL;
+        return NULL;
 
     event = PyObject_CallFunctionObjArgs(type, shim, NULL);
     Py_DECREF(shim);
@@ -97,12 +97,12 @@ xpybProtobj_init(xpybProtobj *self, PyObject *args, PyObject *kw)
     PyObject *parent;
 
     if (!PyArg_ParseTupleAndKeywords(args, kw, "O|nn", kwlist,
-				     &parent, &offset, &size))
-	return -1;
+                                     &parent, &offset, &size))
+        return -1;
 
     self->buf = PyBuffer_FromObject(parent, offset, size);
     if (self->buf == NULL)
-	return -1;
+        return -1;
 
     return 0;
 }