Normalise style with the rest of the code base (PEP 7, etc.)

Modules/_sqlite/module.c

@@ -291,44 +291,47 @@ typedef struct _IntConstantPair IntConstantPair;
 
 /* sqlite API error codes */
 static const IntConstantPair _error_codes[] = {
-  {"SQLITE_ABORT", SQLITE_ABORT},
-  {"SQLITE_AUTH", SQLITE_AUTH},
-  {"SQLITE_BUSY", SQLITE_BUSY},
-  {"SQLITE_CANTOPEN", SQLITE_CANTOPEN},
-  {"SQLITE_CONSTRAINT", SQLITE_CONSTRAINT},
-  {"SQLITE_CORRUPT", SQLITE_CORRUPT},
-  {"SQLITE_DONE", SQLITE_DONE},
-  {"SQLITE_EMPTY", SQLITE_EMPTY},
-  {"SQLITE_ERROR", SQLITE_ERROR},
-  {"SQLITE_FORMAT", SQLITE_FORMAT},
-  {"SQLITE_FULL", SQLITE_FULL},
-  {"SQLITE_INTERNAL", SQLITE_INTERNAL},
-  {"SQLITE_INTERRUPT", SQLITE_INTERRUPT},
-  {"SQLITE_IOERR", SQLITE_IOERR},
-  {"SQLITE_LOCKED", SQLITE_LOCKED},
-  {"SQLITE_MISMATCH", SQLITE_MISMATCH},
-  {"SQLITE_MISUSE", SQLITE_MISUSE},
-  {"SQLITE_NOLFS", SQLITE_NOLFS},
-  {"SQLITE_NOMEM", SQLITE_NOMEM},
-  {"SQLITE_NOTADB", SQLITE_NOTADB},
-  {"SQLITE_NOTFOUND", SQLITE_NOTFOUND},
-  {"SQLITE_OK", SQLITE_OK},
-  {"SQLITE_PERM", SQLITE_PERM},
-  {"SQLITE_PROTOCOL", SQLITE_PROTOCOL},
-  {"SQLITE_RANGE", SQLITE_RANGE},
-  {"SQLITE_READONLY", SQLITE_READONLY},
-  {"SQLITE_ROW", SQLITE_ROW},
-  {"SQLITE_SCHEMA", SQLITE_SCHEMA},
-  {"SQLITE_TOOBIG", SQLITE_TOOBIG},
-  {(char*)NULL, 0},
-  {"SQLITE_UNKNOWN", -1}
+    {"SQLITE_ABORT", SQLITE_ABORT},
+    {"SQLITE_AUTH", SQLITE_AUTH},
+    {"SQLITE_BUSY", SQLITE_BUSY},
+    {"SQLITE_CANTOPEN", SQLITE_CANTOPEN},
+    {"SQLITE_CONSTRAINT", SQLITE_CONSTRAINT},
+    {"SQLITE_CORRUPT", SQLITE_CORRUPT},
+    {"SQLITE_DONE", SQLITE_DONE},
+    {"SQLITE_EMPTY", SQLITE_EMPTY},
+    {"SQLITE_ERROR", SQLITE_ERROR},
+    {"SQLITE_FORMAT", SQLITE_FORMAT},
+    {"SQLITE_FULL", SQLITE_FULL},
+    {"SQLITE_INTERNAL", SQLITE_INTERNAL},
+    {"SQLITE_INTERRUPT", SQLITE_INTERRUPT},
+    {"SQLITE_IOERR", SQLITE_IOERR},
+    {"SQLITE_LOCKED", SQLITE_LOCKED},
+    {"SQLITE_MISMATCH", SQLITE_MISMATCH},
+    {"SQLITE_MISUSE", SQLITE_MISUSE},
+    {"SQLITE_NOLFS", SQLITE_NOLFS},
+    {"SQLITE_NOMEM", SQLITE_NOMEM},
+    {"SQLITE_NOTADB", SQLITE_NOTADB},
+    {"SQLITE_NOTFOUND", SQLITE_NOTFOUND},
+    {"SQLITE_OK", SQLITE_OK},
+    {"SQLITE_PERM", SQLITE_PERM},
+    {"SQLITE_PROTOCOL", SQLITE_PROTOCOL},
+    {"SQLITE_RANGE", SQLITE_RANGE},
+    {"SQLITE_READONLY", SQLITE_READONLY},
+    {"SQLITE_ROW", SQLITE_ROW},
+    {"SQLITE_SCHEMA", SQLITE_SCHEMA},
+    {"SQLITE_TOOBIG", SQLITE_TOOBIG},
+    {NULL, 0},
+    {"SQLITE_UNKNOWN", -1}
 };
 
-const char *sqlite3ErrName(int rc) {
+const char *
+sqlite3ErrName(int rc)
+{
     int i;
     for (i = 0; _error_codes[i].constant_name != 0; i++) {
-        if (_error_codes[i].constant_value == rc)
-          return _error_codes[i].constant_name;
+        if (_error_codes[i].constant_value == rc) {
+            return _error_codes[i].constant_name;
+        }
     }
     // No error code matched.
     return _error_codes[i+1].constant_name;

Modules/_sqlite/util.c

@@ -92,50 +92,51 @@ _pysqlite_seterror(pysqlite_state *state, sqlite3 *db)
     }
 
     /* Create and set the exception. */
-    {
-        const char *error_msg;
-        const char *error_name;
-        PyObject *exc = NULL;
-        PyObject *args = NULL;
-        PyObject *py_code = NULL;
-        PyObject *py_name = NULL;
-
-        error_name = sqlite3ErrName(errorcode);
-
-        error_msg = sqlite3_errmsg(db);
-
-        args = Py_BuildValue("(s)", error_msg);
-        if (!args)
-            goto error;
-
-        exc = PyObject_Call(exc_class, args, NULL);
-        if (!exc)
-            goto error;
-
-        py_code = Py_BuildValue("i", errorcode);
-        if (!py_code)
-            goto error;
+    const char *error_msg;
+    const char *error_name;
+    PyObject *exc = NULL;
+    PyObject *args = NULL;
+    PyObject *py_code = NULL;
+    PyObject *py_name = NULL;
+
+    error_name = sqlite3ErrName(errorcode);
+    error_msg = sqlite3_errmsg(db);
+
+    args = Py_BuildValue("(s)", error_msg);
+    if (args == NULL) {
+        goto error;
+    }
 
-        if (PyObject_SetAttrString(exc, "sqlite_errorcode", py_code) < 0)
-            goto error;
+    exc = PyObject_Call(exc_class, args, NULL);
+    if (exc == NULL) {
+        goto error;
+    }
 
-        py_name = Py_BuildValue("s", error_name);
-        if (!py_name)
-            goto error;
+    py_code = Py_BuildValue("i", errorcode);
+    if (py_code == NULL) {
+        goto error;
+    }
 
-        if (PyObject_SetAttrString(exc, "sqlite_errorname", py_name) < 0)
-            goto error;
+    if (PyObject_SetAttrString(exc, "sqlite_errorcode", py_code) < 0) {
+        goto error;
+    }
 
-        PyErr_SetObject((PyObject *) Py_TYPE(exc), exc);
+    py_name = Py_BuildValue("s", error_name);
+    if (py_name == NULL) {
+        goto error;
+    }
 
-    error:
-        Py_XDECREF(py_code);
-        Py_XDECREF(py_name);
-        Py_XDECREF(args);
-        Py_XDECREF(exc);
+    if (PyObject_SetAttrString(exc, "sqlite_errorname", py_name) < 0) {
+        goto error;
     }
 
+    PyErr_SetObject((PyObject *) Py_TYPE(exc), exc);
 
+error:
+    Py_XDECREF(py_code);
+    Py_XDECREF(py_name);
+    Py_XDECREF(args);
+    Py_XDECREF(exc);
     return errorcode;
 }