Staging
v0.5.1
https://github.com/python/cpython
Revision cb9051a608525c1fd191701e169cd51910f9ceee authored by Anthony Baxter on 28 March 2006, 07:32:36 UTC, committed by Anthony Baxter on 28 March 2006, 07:32:36 UTC
unicode_escape and raw_unicode_escape codec now encodes backslash correctly.

This caused another issue for unicode repr strings being double-escaped
(SF Bug #1459029). Correct fix will be in 2.5, but is too risky for 2.4.3.

Added a testcase for #1459029.
1 parent 51487fe
Raw File
Tip revision: cb9051a608525c1fd191701e169cd51910f9ceee authored by Anthony Baxter on 28 March 2006, 07:32:36 UTC
after discussions with perky, reverted fix for Bug #1379994: Builtin
Tip revision: cb9051a
cryptmodule.c
/* cryptmodule.c - by Steve Majewski
 */

#include "Python.h"

#include <sys/types.h>


/* Module crypt */


static PyObject *crypt_crypt(PyObject *self, PyObject *args)
{
	char *word, *salt; 
	extern char * crypt(const char *, const char *);

	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));

}

PyDoc_STRVAR(crypt_crypt__doc__,
"crypt(word, salt) -> string\n\
word will usually be a user's password. salt is a 2-character string\n\
which will be used to select one of 4096 variations of DES. The characters\n\
in salt must be either \".\", \"/\", or an alphanumeric character. Returns\n\
the hashed password as a string, which will be composed of characters from\n\
the same alphabet as the salt.");


static PyMethodDef crypt_methods[] = {
	{"crypt",	crypt_crypt, METH_VARARGS, crypt_crypt__doc__},
	{NULL,		NULL}		/* sentinel */
};

PyMODINIT_FUNC
initcrypt(void)
{
	Py_InitModule("crypt", crypt_methods);
}
back to top