Changeset 391 for python/trunk/Modules/sgimodule.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Modules/sgimodule.c (modified) (3 diffs)

python/trunk/Modules/sgimodule.c

@@ -11 +11 @@
 sgi_nap(PyObject *self, PyObject *args)
 {
-        long ticks;
-        if (!PyArg_ParseTuple(args, "l:nap", &ticks))
-                return NULL;
-        Py_BEGIN_ALLOW_THREADS
-        sginap(ticks);
-        Py_END_ALLOW_THREADS
-        Py_INCREF(Py_None);
-        return Py_None;
+    long ticks;
+    if (!PyArg_ParseTuple(args, "l:nap", &ticks))
+        return NULL;
+    Py_BEGIN_ALLOW_THREADS
+    sginap(ticks);
+    Py_END_ALLOW_THREADS
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
@@ -26 +26 @@
 sgi__getpty(PyObject *self, PyObject *args)
 {
-        int oflag;
-        int mode;
-        int nofork;
-        char *name;
-        int fildes;
-        if (!PyArg_ParseTuple(args, "iii:_getpty", &oflag, &mode, &nofork))
-                return NULL;
-        errno = 0;
-        name = _getpty(&fildes, oflag, (mode_t)mode, nofork);
-        if (name == NULL) {
-                PyErr_SetFromErrno(PyExc_IOError);
-                return NULL;
-        }
-        return Py_BuildValue("(si)", name, fildes);
+    int oflag;
+    int mode;
+    int nofork;
+    char *name;
+    int fildes;
+    if (!PyArg_ParseTuple(args, "iii:_getpty", &oflag, &mode, &nofork))
+        return NULL;
+    errno = 0;
+    name = _getpty(&fildes, oflag, (mode_t)mode, nofork);
+    if (name == NULL) {
+        PyErr_SetFromErrno(PyExc_IOError);
+        return NULL;
+    }
+    return Py_BuildValue("(si)", name, fildes);
 }
 
 static PyMethodDef sgi_methods[] = {
-        {"nap",         sgi_nap,        METH_VARARGS},
-        {"_getpty",     sgi__getpty,    METH_VARARGS},
-        {NULL,          NULL}           /* sentinel */
+    {"nap",             sgi_nap,        METH_VARARGS},
+    {"_getpty",         sgi__getpty,    METH_VARARGS},
+    {NULL,              NULL}           /* sentinel */
 };
 
@@ -52 +52 @@
 initsgi(void)
 {
-        Py_InitModule("sgi", sgi_methods);
+    Py_InitModule("sgi", sgi_methods);
 }