mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

This reverts r63675 based on the discussion in this thread:

Browse source 
http://mail.python.org/pipermail/python-dev/2008-June/079988.html

Python 2.6 should stick with PyString_* in its codebase.  The PyBytes_* names
in the spirit of 3.0 are available via a #define only.  See the email thread.
This commit is contained in:
Gregory P. Smith 2008-06-09 04:58:54 +00:00
parent e98839a1f4
commit dd96db63f6
173 changed files with 2275 additions and 2280 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/md5module.c
View file

@ -80,7 +80,7 @@ md5_digest(md5object *self)
mdContext = self->md5;
md5_finish(&mdContext, aDigest);
return PyBytes_FromStringAndSize((char *)aDigest, 16);
return PyString_FromStringAndSize((char *)aDigest, 16);
}
PyDoc_STRVAR(digest_doc,
@ -113,7 +113,7 @@ md5_hexdigest(md5object *self)
c = (c>9) ? c+'a'-10 : c + '0';
hexdigest[j++] = c;
}
return PyBytes_FromStringAndSize((char*)hexdigest, 32);
return PyString_FromStringAndSize((char*)hexdigest, 32);
}
@ -165,7 +165,7 @@ md5_get_digest_size(PyObject *self, void *closure)
static PyObject *
md5_get_name(PyObject *self, void *closure)
{
return PyBytes_FromStringAndSize("MD5", 3);
return PyString_FromStringAndSize("MD5", 3);
}
static PyGetSetDef md5_getseters[] = {