Changeset 391 for python/trunk/Modules/cryptmodule.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/cryptmodule.c (modified) (3 diffs)

python/trunk/Modules/cryptmodule.c

@@ -15 +15 @@
 static PyObject *crypt_crypt(PyObject *self, PyObject *args)
 {
-        char *word, *salt; 
+    char *word, *salt;
 #ifndef __VMS
-        extern char * crypt(const char *, const char *);
+    extern char * crypt(const char *, const char *);
 #endif
 
-        if (!PyArg_ParseTuple(args, "ss:crypt", &word, &salt)) {
-                return NULL;
-        }
-        /* On some platforms (AtheOS) crypt returns NULL for an invalid
-           salt. Return None in that case. XXX Maybe raise an exception?  */
-        return Py_BuildValue("s", crypt(word, salt));
+    if (!PyArg_ParseTuple(args, "ss:crypt", &word, &salt)) {
+        return NULL;
+    }
+    /* On some platforms (AtheOS) crypt returns NULL for an invalid
+       salt. Return None in that case. XXX Maybe raise an exception?  */
+    return Py_BuildValue("s", crypt(word, salt));
 
 }
@@ -39 +39 @@
 
 static PyMethodDef crypt_methods[] = {
-        {"crypt",       crypt_crypt, METH_VARARGS, crypt_crypt__doc__},
-        {NULL,          NULL}           /* sentinel */
+    {"crypt",           crypt_crypt, METH_VARARGS, crypt_crypt__doc__},
+    {NULL,              NULL}           /* sentinel */
 };
 
@@ -46 +46 @@
 initcrypt(void)
 {
-        Py_InitModule("crypt", crypt_methods);
+    Py_InitModule("crypt", crypt_methods);
 }