diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Modules/md5module.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.zip cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.bz2 | |
This reverts r63675 based on the discussion in this thread:
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.
Diffstat (limited to 'Modules/md5module.c')
| -rw-r--r-- | Modules/md5module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/md5module.c b/Modules/md5module.c index 7095202..1e2e6e3 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -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[] = { |