This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7878

sha1dc: use proper string functions on Python 2/3
ClosedPublic

Authored by indygreg on Jan 14 2020, 8:54 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG29a110e2776e: sha1dc: use proper string functions on Python 2/3
Summary

PyString_FromStringAndSize doesn't exist on Python 3: we need
to use PyUnicode_FromStringAndSize.

The extension now compiles without warnings on Python 2 and 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 14 2020, 8:54 PM
pulkit accepted this revision.Jan 15 2020, 7:09 AM
This revision is now accepted and ready to land.Jan 15 2020, 7:09 AM
indygreg added a commit: rHG29a110e2776e: sha1dc: use proper string functions on Python 2/3.Jan 15 2020, 8:17 AM
Closed by commit rHG29a110e2776e: sha1dc: use proper string functions on Python 2/3 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/thirdparty/sha1dc/cext.c (2 lines)

Diff 19289

mercurial/thirdparty/sha1dc/cext.c

int i; int i;
if (!finalize(self->ctx, hash)) { if (!finalize(self->ctx, hash)) {
return NULL; return NULL;
} }
for (i = 0; i < 20; ++i) { for (i = 0; i < 20; ++i) {
hexhash[i * 2] = hexdigit[hash[i] >> 4]; hexhash[i * 2] = hexdigit[hash[i] >> 4];
hexhash[i * 2 + 1] = hexdigit[hash[i] & 15]; hexhash[i * 2 + 1] = hexdigit[hash[i] & 15];
} }
return PyString_FromStringAndSize(hexhash, 40); return PY23(PyString_FromStringAndSize, PyUnicode_FromStringAndSize)(hexhash, 40);
} }
static PyTypeObject sha1ctxType; static PyTypeObject sha1ctxType;
static PyObject *pysha1ctx_copy(pysha1ctx *self) static PyObject *pysha1ctx_copy(pysha1ctx *self)
{ {
pysha1ctx *clone = (pysha1ctx *)PyObject_New(pysha1ctx, &sha1ctxType); pysha1ctx *clone = (pysha1ctx *)PyObject_New(pysha1ctx, &sha1ctxType);
if (!clone) { if (!clone) {