diff options
| author | Guido van Rossum <guido@python.org> | 2007-11-06 21:34:58 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-11-06 21:34:58 +0000 |
| commit | f30787b61e3d43d90887955cece23652b16f4fd5 (patch) | |
| tree | c012a4d4f3a340842871635f5f89585371140c57 /Modules/sha256module.c | |
| parent | a75539107c7a46872a936ec373ba1084db35c296 (diff) | |
| download | cpython-f30787b61e3d43d90887955cece23652b16f4fd5.tar.gz | |
Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137
branch. The most obvious changes:
- str8 renamed to bytes (PyString at the C level);
- bytes renamed to buffer (PyBytes at the C level);
- PyString and PyUnicode are no longer compatible.
I.e. we now have an immutable bytes type and a mutable bytes type.
The behavior of PyString was modified quite a bit, to make it more
bytes-like. Some changes are still on the to-do list.
Diffstat (limited to 'Modules/sha256module.c')
| -rw-r--r-- | Modules/sha256module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/sha256module.c b/Modules/sha256module.c index da31d18d1f..a5dc9ade8a 100644 --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -432,7 +432,7 @@ SHA256_digest(SHAobject *self, PyObject *unused) SHAcopy(self, &temp); sha_final(digest, &temp); - return PyBytes_FromStringAndSize((const char *)digest, self->digestsize); + return PyString_FromStringAndSize((const char *)digest, self->digestsize); } PyDoc_STRVAR(SHA256_hexdigest__doc__, |