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/shamodule.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/shamodule.c')
| -rw-r--r-- | Modules/shamodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/shamodule.c b/Modules/shamodule.c index 0cb8784..1a7fc2c 100644 --- a/Modules/shamodule.c +++ b/Modules/shamodule.c @@ -380,7 +380,7 @@ SHA_digest(SHAobject *self, PyObject *unused) SHAcopy(self, &temp); sha_final(digest, &temp); - return PyBytes_FromStringAndSize((const char *)digest, sizeof(digest)); + return PyString_FromStringAndSize((const char *)digest, sizeof(digest)); } PyDoc_STRVAR(SHA_hexdigest__doc__, @@ -400,10 +400,10 @@ SHA_hexdigest(SHAobject *self, PyObject *unused) sha_final(digest, &temp); /* Create a new string */ - retval = PyBytes_FromStringAndSize(NULL, sizeof(digest) * 2); + retval = PyString_FromStringAndSize(NULL, sizeof(digest) * 2); if (!retval) return NULL; - hex_digest = PyBytes_AsString(retval); + hex_digest = PyString_AsString(retval); if (!hex_digest) { Py_DECREF(retval); return NULL; @@ -463,7 +463,7 @@ SHA_get_digest_size(PyObject *self, void *closure) static PyObject * SHA_get_name(PyObject *self, void *closure) { - return PyBytes_FromStringAndSize("SHA1", 4); + return PyString_FromStringAndSize("SHA1", 4); } static PyGetSetDef SHA_getseters[] = { |