This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3588

pathencode: hashlib.sha1() takes bytes not str on Python 3
ClosedPublic

Authored by durin42 on May 18 2018, 8:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4fccc73ce2f6: pathencode: hashlib.sha1() takes bytes not str on Python 3
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 18 2018, 8:51 PM
Closed by commit rHG4fccc73ce2f6: pathencode: hashlib.sha1() takes bytes not str on Python 3 (authored by durin42). · Explain WhyMay 18 2018, 10:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/pathencode.c (2 lines)

Diff 8750

mercurial/cext/pathencode.c

if (shafunc == NULL) { if (shafunc == NULL) {
PyErr_SetString(PyExc_AttributeError, PyErr_SetString(PyExc_AttributeError,
"module 'hashlib' has no " "module 'hashlib' has no "
"attribute 'sha1'"); "attribute 'sha1'");
return -1; return -1;
} }
} }
shaobj = PyObject_CallFunction(shafunc, "s#", str, len); shaobj = PyObject_CallFunction(shafunc, PY23("s#", "y#"), str, len);
if (shaobj == NULL) if (shaobj == NULL)
return -1; return -1;
hashobj = PyObject_CallMethod(shaobj, "digest", ""); hashobj = PyObject_CallMethod(shaobj, "digest", "");
Py_DECREF(shaobj); Py_DECREF(shaobj);
if (hashobj == NULL) if (hashobj == NULL)
return -1; return -1;